Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
45,614 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

556 Commits

Author SHA1 Message Date
jsteemann e4d1349e6f debug output for RestHandlers 2016-10-11 17:51:41 +02:00
Simon Grätzer d6dc8e776d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-07 11:52:20 +02:00
Frank Celler 8e3a73281e added more events 2016-10-06 14:14:38 +02:00
Frank Celler f83f6a7114 more authentication events, fixed changePassword 2016-10-03 19:54:54 +02:00
Simon Grätzer c927c3aa15 Initial Pregel try 2016-10-03 18:08:06 +02:00
jsteemann 501c368ae8 added experimental support for incoming gzip-compressed requests 2016-09-19 08:57:21 +02:00
jsteemann 542f4bb955 removed unused flag 2016-09-15 08:44:07 +02:00
Jan Christoph Uhde c0d254af03 reply when auth is not enabled 2016-09-09 16:08:30 +02:00
Jan Christoph Uhde 56dcc3c455 fix disable authentication when this is requested by user via flag 2016-09-09 15:58:30 +02:00
Jan Christoph Uhde a55ff6a63a fix control flow in vpp authentication 2016-09-09 15:42:54 +02:00
Frank Celler eed90fc588 fixed cppcheck warnings 2016-09-09 15:08:48 +02:00
Jan Christoph Uhde b06666c5e5 fix compiler warning 2016-09-09 14:11:20 +02:00
Jan Christoph Uhde 035d736fc0 Revert "fix bug with missing agents" 
This reverts commit e230e3e2c5.
 2016-09-09 12:59:25 +02:00
Jan Christoph Uhde 6594a1cd58 add fix for windows 2016-09-09 11:49:12 +02:00
Jan Christoph Uhde 6fa320299e fix authentication 2016-09-09 11:43:07 +02:00
Jan Christoph Uhde e230e3e2c5 fix bug with missing agents 2016-09-09 11:21:05 +02:00
Jan Christoph Uhde 79fc0094e9 add authorization/authentication for vpp 2016-09-09 11:08:50 +02:00
Jan Christoph Uhde 26f1ec7db1 shorten processRead() 2016-09-09 09:41:59 +02:00
Jan Christoph Uhde f4994993da fix return value with optional 2016-09-09 00:06:34 +02:00
Jan Christoph Uhde fb776a0e95 begin refactoring of processRead 2016-09-08 22:59:23 +02:00
Jan Christoph Uhde fc57c4809b Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream 
* 'generic-col-types' of github.com:arangodb/arangodb: (168 commits)
  fix memleak
  Fixed shutdown of Traversal Blocks in Cluster
  restructuring agent wakeup
  remove visibility
  Traverser engine now unlocks all it's shards
  handle 0 values
  added HTTP REST APIs for online loglevel adjustments:
  move json-utilities to the place where it is solely used
  too verbose messages from cluster.js
  unify exception debugging
  Improved shutdown process of Graph Traverser Engines. This state causes a double free. Merge commit.
  silenced cppcheck warning
  silenced cppcheck warning
  silenced warning in maintainer-mode
  allow inline suppression
  give more debug info
  cosmetics
  properly free EngineInfo
  fix memleak
  fix some leaks
  ...
 2016-09-08 16:00:43 +02:00
Jan Christoph Uhde b560d15b72 prepare to send multiple chunks and do compression 2016-09-08 15:59:33 +02:00
jsteemann cb3d2eb6b9 Merge branch 'obi-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-08 13:58:36 +02:00
jsteemann 504b102268 added HTTP REST APIs for online loglevel adjustments: 
- GET `/_admin/log/level` returns the current loglevel settings
- PUT `/_admin/log/level` modifies the current loglevel settings
 2016-09-08 11:15:49 +02:00
Jan Christoph Uhde 99f592bae1 fix add multiple payloads for VppMessageNoOwnBuffer 2016-09-07 14:42:51 +02:00
jsteemann 7ae36773ec moved implementation of `/_admin/wal` REST handlers to C++ 2016-09-07 13:48:52 +02:00
jsteemann 13a3470087 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 11:44:54 +02:00
Jan Christoph Uhde af8649479f clean up code 2016-09-06 14:46:37 +02:00
Jan Steemann 536e928329 fixed invalid pointers 2016-09-06 14:22:32 +02:00
Jan Christoph Uhde 44d7f0ffad do not even try to answer on error on protocol level 2016-09-06 13:55:35 +02:00
Jan Christoph Uhde 275ebf566f add patch requested by mark 2016-09-06 13:42:47 +02:00
Jan Christoph Uhde 905c06d88e add new agent to allow 2 answers to one message 2016-09-06 13:26:27 +02:00
Michael Hackstein e22014a272 Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types 2016-09-06 09:33:23 +02:00
jsteemann df808cd665 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
jsteemann e2d0f4342f respond with proper error message in case queue is full 2016-09-05 11:02:11 +02:00
jsteemann 67de3f7bb2 work less on the heap 2016-09-02 15:51:02 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +02:00
Jan Christoph Uhde ee10949dcf fix cursor test for vpp 2016-09-01 12:12:28 +02:00
Jan Christoph Uhde 63fa20fb42 Merge remote-tracking branch 'origin/devel' into obi-velocystream-try-merge-devel 
* origin/devel:
  don't leak on help
  Abort compilation process if the cmake configure run fails
  || exit 1
  Handle 503 answer from dbservers properly
  return service unavailable during shutdown
  Add cxgcc snippets
  fix users home directory.
  Fix debian scripted password documentation.
  slighty improved error handling in import API
  fixed issue #2026
  Fix release matching for alpha/beta versions
  We mustn't use minuses in the releases since that will collide later on with packaging.
  Pass arguments along to build.sh
  Fix windows NSIS client package
  fix typo
  - properly use armhf for armv7 packages - specify CPACK_DEBIAN_PACKAGE_ARCHITECTURE so one can cx-compile packages.

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	lib/Rest/FakeRequest.cpp
 2016-08-31 15:06:27 +02:00
Jan Christoph Uhde f09bf540bc change setPayload and add requested ContentType in response 2016-08-31 14:32:04 +02:00
jsteemann a845aa5e78 fix memleak 2016-08-31 11:43:10 +02:00
jsteemann c8ee419a80 fix calls 2016-08-31 11:23:48 +02:00
jsteemann 71e13cb071 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 11:12:44 +02:00
jsteemann f116ae4cc3 fixed leak 2016-08-31 11:12:24 +02:00
Frank Celler 9bb239b737 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-08-31 10:38:59 +02:00
Frank Celler 52c2c4a3ac return service unavailable during shutdown 2016-08-31 10:38:53 +02:00
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel 
* devel: (24 commits)
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
 2016-08-30 22:04:31 +02:00
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
Simran Brucherseifer dc8ced3a9b Fix comments 2016-08-29 11:52:09 +02:00
Jan Steemann 4b5249dc5e issue #2022: double max allowed request body size, cap --batch-size value in arangoimp 2016-08-29 09:34:23 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
Jan Christoph Uhde 8e56b1df7d improve logging 2016-08-26 16:22:49 +02:00
Jan Christoph Uhde d635b720b0 try to add statistics to VppCommTask 2016-08-26 15:15:33 +02:00
Jan Christoph Uhde 221b35267c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-agent 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (29 commits)
  removed define that was used only once
  fix dumping of VPackSlices without CustomTypeHandler
  remove includes
  add no-throttling hint for compactor, too
  remove function pointers from TRI_datafile_t, added constructor and destructor
  moved functionality into engine
  fixed tests
  finalize classes
  fix agency shutdown
  cppcheck
  cppcheck
  fix agency shutdown
  removed unused file
  more diagnostic output
  issue #2006: added more diagnostic output for some replication errors
  allow dropping system collections in some rare cases
  updated CHANGELOG
  fixed issue #2012
  explain why we fail to fetch the git revision.
  Cleanup cmake process so it doesn't barf on problems to detect the git version.
  ...
 2016-08-26 11:47:23 +02:00
Jan Christoph Uhde ae77145651 clean up commtaks - and prepare for merge with jan that will avoid exceptions 2016-08-26 10:58:36 +02:00
Jan Christoph Uhde c42bc4016a Merge branch 'obi-velocystream' into obi-velocystream-agent 
* obi-velocystream:
  fix usage of unique_ptr
  rename HttpServerJob -> GeneralServerJob
  improve error handling
  improve error handling

Conflicts:
	arangod/GeneralServer/GeneralServer.cpp
 2016-08-26 09:20:12 +02:00
Jan Christoph Uhde 999991bd44 fix usage of unique_ptr 2016-08-26 09:15:54 +02:00
Jan Christoph Uhde b5cd47e579 rename HttpServerJob -> GeneralServerJob 2016-08-26 09:04:06 +02:00
Jan Christoph Uhde 2f8e27af0c Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'obi-velocystream' of github.com:arangodb/arangodb:
  improve error handling
 2016-08-25 16:49:05 +02:00
Jan Christoph Uhde 88695ea334 improve error handling 2016-08-25 16:46:56 +02:00
Jan Christoph Uhde 8e950a9d2a improve error handling 2016-08-25 16:39:49 +02:00
Jan Christoph Uhde 975a3a8aa0 StatisticsAgent is no longer CommTask base - http_server tests ok! 2016-08-25 16:21:45 +02:00
Jan Christoph Uhde 2ba4901b86 fist changes to get request agents working 2016-08-25 13:28:19 +02:00
jsteemann f4aa60ed0d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:38:26 +02:00
Wilfried Goesgens 4939e02fb2 Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +02:00
Jan Christoph Uhde 54249cb5ae fix header access 2016-08-24 16:24:09 +02:00
Jan Christoph Uhde f9feb14a6e Revert "Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream" 
This reverts commit 76679e1636, reversing
changes made to 5be5030983.

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-24 15:26:49 +02:00
Jan Christoph Uhde e0d914fcc1 Revert "add options to Slice::get and use them for VPackHeader" 
This reverts commit b2f99adaaa.
 2016-08-24 15:11:22 +02:00
Jan Christoph Uhde 44b54425e3 fix: move extra ProcessRead to correct file:) 2016-08-24 14:33:31 +02:00
Jan Christoph Uhde c4f96cec7c fix: add missing processRead() at the end of addResponse 2016-08-24 14:20:06 +02:00
Jan Christoph Uhde 76679e1636 Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream 
* obi-velocystream-attribute-translator:
  add options to Slice::get and use them for VPackHeader
  add translator to VelocyPackHelper and headerOption to Vpp Protocol

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
	lib/Rest/CommonDefines.h
 2016-08-24 09:18:35 +02:00
Jan Christoph Uhde 0184399ba7 clean up - remove enumToEnum magic 2016-08-23 15:58:50 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde a6f5fc97de finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +02:00
Jan Christoph Uhde 4873a9be71 finish ContentType enum 2016-08-23 15:02:55 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Jan Christoph Uhde b2f99adaaa add options to Slice::get and use them for VPackHeader 2016-08-23 13:44:10 +02:00
Jan Christoph Uhde 8f5e6f65d6 add translator to VelocyPackHelper and headerOption to Vpp Protocol 2016-08-23 13:05:50 +02:00
Jan Christoph Uhde 86f887db92 even more error messages 2016-08-23 09:33:03 +02:00
Jan Christoph Uhde e2d41278af slightly better error messages 2016-08-22 09:18:35 +02:00
Jan Christoph Uhde 487ec78430 mark len constexpr 2016-08-22 08:38:03 +02:00
Jan Christoph Uhde aff54b2da9 Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream:
  changes for Visual Studio
 2016-08-21 12:39:18 +02:00
Jan Christoph Uhde 2b5a0f1eec shorten code 2016-08-21 00:57:07 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Jan Christoph Uhde e2cc11e22a better reporting of errors 2016-08-19 14:23:11 +02:00
Jan Christoph Uhde 5a236bbade fix number of payloads 2016-08-19 13:52:46 +02:00
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream 
* origin/obi-velocystream-frank:
  fixed ownership of handler

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-19 09:58:27 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Jan Christoph Uhde e5794ac583 enable handling of multiple vpacks in a message 2016-08-18 11:44:03 +02:00
Jan Christoph Uhde 48ac791dd6 prepare auth 2016-08-18 08:36:42 +02:00
Jan Christoph Uhde 34c0aa3540 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-test 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (30 commits)
  potentially fix thread pool shutdown issues
  Remove the boost documentation. The wintendo can't stand long filenames in 2016
  move CleanupThread into engine
  Revert "Disable testcases for now, it triggers the crash on windows."
  slightly improve execution logic
  grunt build
  improved gv
  removed obsolete defines
  assert a certain size
  removed unused version attribute
  removed unused method
  removed unused attributes
  removed unused enum
  privatized
  Revert "Remove iconv-lite"
  privatize some compaction infos
  changed index detection
  removed unused files
  privatize method
  privatized method
  ...
 2016-08-17 13:25:37 +02:00
Jan Christoph Uhde 3fb68c632d handleSimpleError now respects messageId 2016-08-17 13:22:31 +02:00
Jan Christoph Uhde 21a9f64538 remove: _request from CommTask and contentType from setPayload() 2016-08-17 09:29:23 +02:00
Jan Christoph Uhde 341891ed74 clang format 2016-08-16 13:33:16 +02:00
Jan Christoph Uhde 6f2ce0cd5a make better use of readbuffer 2016-08-16 13:32:30 +02:00
jsteemann d5af72f47f fix typo in method name 2016-08-16 13:11:39 +02:00
Jan Christoph Uhde 9afe3a1016 fix buffer clean up 2016-08-16 10:58:20 +02:00
Jan Christoph Uhde a3328dc944 avoid bug that occurred during buffer resize by allocating up front 2016-08-16 10:28:31 +02:00
Jan Christoph Uhde a7229bb698 i fix type of execepton so it gets caught 2016-08-16 09:29:02 +02:00
Jan Christoph Uhde b50659ed27 avoid dumper exception 2016-08-16 09:12:54 +02:00
Jan Christoph Uhde d142dc6b08 Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'obi-velocystream' of github.com:arangodb/arangodb:
  added handleSimpleError for database not found
 2016-08-16 08:52:51 +02:00
Jan Christoph Uhde 1d1e19678d failed try to resolve externals 2016-08-15 22:58:21 +02:00
a-brandt 758cc8c985 added handleSimpleError for database not found 2016-08-15 17:05:35 +02:00
Jan Christoph Uhde e511cd4ab9 silence complier warnings 2016-08-15 15:18:10 +02:00
Jan Christoph Uhde e62b4f69d6 add better logging and clean up code 2016-08-12 15:05:03 +02:00
Jan Christoph Uhde 3d4e1f6922 clean up code 2016-08-11 16:44:12 +02:00
Jan Christoph Uhde a1d6909f88 make use of generateBody in payload and fix some bugs in VppCommTask 2016-08-11 13:20:58 +02:00
Jan Christoph Uhde fa42f55545 clang format 2016-08-10 20:08:17 +02:00
Jan Christoph Uhde fe84762bef fix header of velocypack chunks 2016-08-10 16:42:42 +02:00
Jan Christoph Uhde c4444ae4e4 fix vppCommTask - do not return true when false should be returned 2016-08-10 15:17:31 +02:00
Jan Christoph Uhde 804d2e70d4 mini fixes 2016-08-10 12:50:50 +02:00
Jan Christoph Uhde da0c40cff7 server should now reply 2016-08-10 11:11:26 +02:00
Jan Christoph Uhde 8f6ff64d00 fix errors in vpp protocol 2016-08-09 19:09:24 +02:00
Jan Christoph Uhde 0e5b455159 setPayload of response now takes contType instead of request 2016-08-08 14:48:56 +02:00
Jan Christoph Uhde 65e5d4e6ac fix handling of content type 2016-08-05 12:25:29 +02:00
Jan Christoph Uhde 0bcbe92433 Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream 
* origin/engine-vs-velocystream: (95 commits)
  move it a class method
  speed up compaction and cleanup a bit
  privatization
  added functions V8_TO_VPACK and VPACK_TO_V8
  fixed compaction bug
  fixed compaction bug
  raft testing revealed performance optimisation in receiver and of appendentries
  more streamlining, links to the UDF documentation.
  refactoring
  By simran: review UDF documentation.
  Explain clustering impacts in the optimizer chapter.
  fixed tests
  WG beautification
  Remove iconv-lite
  Add iconv-lite and timezone
  Add missing package description file.
  compaction bug in agency
  compaction bug in agency
  compaction bug in agency
  fixed compaction bug
  ...
 2016-08-04 18:48:51 +02:00
Jan Christoph Uhde 50fe64d6ca convert contentTypes 2016-08-04 16:42:30 +02:00
Jan Christoph Uhde 01c1c09d5a add first vpack test -- content type has to be fixed first 2016-08-04 13:32:25 +02:00
Jan Christoph Uhde 54eda61754 connect response to CommTask WriteBuffers 2016-08-03 16:08:04 +02:00
Jan Christoph Uhde cae1d47e5d fix build errors 2016-08-03 09:42:20 +02:00
Jan Christoph Uhde cb275e239f add: clean buffer for VppCommTask 2016-08-03 09:20:22 +02:00
Jan Christoph Uhde 08cc5c543e remove unused code - small fixes 2016-08-02 15:57:30 +02:00
jsteemann dd30b47b9d make _state private 2016-08-02 15:31:55 +02:00
Jan Christoph Uhde 25226b1459 add: header() / headers() implemented for VppRequest 2016-08-02 11:36:06 +02:00
Michael Hackstein 994a99e31f Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-01 16:50:54 +02:00
Jan Christoph Uhde 3e6c7617d0 small improvements 2016-08-01 08:54:27 +02:00
Jan Christoph Uhde 5f370e0f46 reading vpp should work now! 2016-07-29 11:03:26 +02:00
Jan Christoph Uhde d574570174 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-4 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (70 commits)
  fixed undefined behavior
  fixed tests
  Latest performance measuring scripts and analysis program.
  moved dropCollection into TRI_vocbase_t
  make ctor explicit
  Improve error handling
  removed unused consts
  Fix ssl tests (CORS)
  more refactoring
  some vocbase refactoring
  updated CHANGELOG
  added thread affinity for MacOSX
  moved query id generation
  refactoring
  Fix testing.js
  Docs: make examples clearer that require modules, add note about aqlQuery -> aql
  Docs (arangosh): aqlQuery -> aql
  reactivate TickIterator
  refactoring
  New script version.
  ...
 2016-07-28 16:36:36 +02:00
Jan Christoph Uhde 4f00b0a48e silence compiler warning 2016-07-28 16:16:56 +02:00
jsteemann ebaabdb076 Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
Jan Christoph Uhde fa0015e658 add: implemented part of VppCommTask 2016-07-28 13:58:51 +02:00
jsteemann 55eda66d4a Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-27 15:57:56 +02:00
Jan Christoph Uhde 36167b8e17 Merge remote-tracking branch 'origin/devel' into obi-velocystream-4 
* origin/devel: (23 commits)
  Fix trusted origin tests
  Fix CORS with credentials
  New version of script.
  updated CHANGELOG
  grunt build [ci skip]
  improved gv
  added expand function to gv
  enable: compile_commands.json
  semistandard fix
  improved gv
  gv bugfix
  updated license
  improved gv
  Adapting to 64 bit ARM architecture (aarch64) at the exceptions for TRI_PADDING_32
  improved gv performance
  fix handling of empty query strings
  fixed query editor issues
  Modularize perf script.
  Add one more event.
  Add a first perf probe monitoring script.
  ...

Conflicts:
	arangod/GeneralServer/HttpCommTask.cpp
 2016-07-27 13:25:34 +02:00
Jan Christoph Uhde 732c182388 fix building 2016-07-27 12:08:07 +02:00
Jan Christoph Uhde 3f57335fe4 with error 2016-07-27 11:48:21 +02:00
Andreas Streichardt 5fe3274000 Fix CORS with credentials 2016-07-27 11:25:46 +02:00
Jan Christoph Uhde 9965ca9c6a Merge branch 'obi-velocystream-2' into obi-velocystream-3 
* obi-velocystream-2: (21 commits)
  enable VPACK
  add some documentation
  add some documenation
  get rid fo cookies in non-http requests
  Documentation improvements
  Docs: Fix locking and isolation code examples (require db object and use AQL traversal)
  fix recovery edge case
  grunt build [ci skip]
  added edge hover event
  redirect to new gv
  ui added query execution of selected text
  gv improvements
  removed unused code path
  added convenience method getRegister()
  remove body() method from GeneralRequest
  Removing unnecessary library "z" by cross-compiling
  Adaptation of V8 architecture "arm64" with "aarch64" processor.
  Complete to __aarch64__ achritectur
  add: VppResponse
  cppcheck
  ...

Conflicts:
	arangod/GeneralServer/GeneralCommTask.cpp
	arangod/GeneralServer/GeneralCommTask.h
	arangod/GeneralServer/HttpCommTask.h
 2016-07-27 10:11:50 +02:00
Michael Hackstein 3dac8c27ed Implemented infrastructure for the TraversalEngines. We can now create and delete these engines accross several requests/threads. Right now the engines are empty. 2016-07-27 10:08:45 +02:00
Frank Celler e008a3b306 moved accessControlAllowOrigins to GeneralServerFeature 2016-07-27 09:09:07 +02:00
Frank Celler 078457c302 cleanup of calls 2016-07-26 17:20:14 +02:00
Jan Christoph Uhde d93b709b4f add some documentation 2016-07-26 13:51:56 +02:00
Jan Christoph Uhde c17d6d0e3a add some documenation 2016-07-26 11:43:01 +02:00
jsteemann 2d293261cc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 16:54:12 +02:00
jsteemann fe99ca558a removed unused code path 2016-07-25 16:52:39 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
Frank Celler 23d7fc7247 moved startThread from HttpCommTask to RestHandler 2016-07-25 16:40:29 +02:00
jsteemann 6a480c0214 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 15:48:57 +02:00
jsteemann 33c94e5041 moved database lookup functions into DatabaseFeature 2016-07-25 14:56:39 +02:00
Jan Steemann ee7def3440 initialize all instance variables 2016-07-25 12:23:19 +02:00
jsteemann a92ac7be28 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 11:14:44 +02:00
Frank Celler a7679fe16f silenced compiler warning 2016-07-24 11:30:39 +02:00
Frank Celler 96e69b5b92 moved create of CommTask into ListenTask 2016-07-23 20:04:38 +02:00
Frank Celler a92add0a9f renamed RestServerFeature to GeneralServerFeature 2016-07-23 14:16:10 +02:00
Jan Christoph Uhde b8c705868e Split Http- and HttpsCommTask 
add .ctags_exclude and new CommTasks

move some code form GeneralCommTask to HttpCommTask

move more code into HttpCommTask

fix ording or initialization

if access of classes

make _requestAsHttp() private

more cleanup
 2016-07-23 01:17:48 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00