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

33469 Commits

Author SHA1 Message Date
jsteemann fb4b3d0a3c Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache 2016-08-24 11:07:45 +02:00
jsteemann 7794b76b33 intermediate commit 2016-08-24 10:54:47 +02:00
hkernbach 69b48e65ad updated licenses 2016-08-24 10:49:15 +02:00
jsteemann 6fc162d5a1 fix compile errors after merge 2016-08-24 09:44:05 +02:00
jsteemann f92815b09b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00
jsteemann b29103c1f1 fix collector inactivity in shutdown 2016-08-24 09:37:47 +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
hkernbach 4e74b6c89f grunt 2016-08-24 09:17:23 +02:00
hkernbach edc3abf4ad Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-08-24 09:03:27 +02:00
Simran Brucherseifer 1c95b68296 Improve: what to make vertices and dedges 2016-08-23 18:42:34 +02:00
Wilfried Goesgens 6934baa6a4 Attempt not to bypass error handling so we hopefully get some more information on issue #2011 2016-08-23 17:02:28 +02:00
Jan Christoph Uhde 5be5030983 Merge branch 'obi-velocystream-enums' into engine-vs-velocystream 
* obi-velocystream-enums:
  clean up - remove enumToEnum magic
  finish ResponseCode enum
  finish  ProtocolVersion, ProtocolType and ConnectionType
  finish ContentType enum
  preapre move of ContentTypes
  finish RequestType enum
  prepare replacement of request types
  even more error messages
  slightly better error messages
  better exceptions form event loop
  mark len constexpr

Conflicts:
	arangod/Agency/Inception.cpp
 2016-08-23 16:01:58 +02:00
Jan Christoph Uhde 0184399ba7 clean up - remove enumToEnum magic 2016-08-23 15:58:50 +02:00
Kaveh Vahedipour be51564141 updated agency pool 2016-08-23 15:57:13 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Kaveh Vahedipour fb8173b1ec rest handler now timeouts when no leadership established and reports 503 2016-08-23 15:38:32 +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 140b8dc802 preapre move of ContentTypes 2016-08-23 14:55:34 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Wilfried Goesgens 2c88849b7a Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-08-23 14:45:39 +02:00
jsteemann 85cb227a4f fixed wrong default values for _sslOptions 2016-08-23 14:34:05 +02:00
jsteemann 50ced553b8 validate default value for DiscreteValuesParameter 2016-08-23 14:33:48 +02:00
Jan Christoph Uhde ed60eca896 prepare replacement of request types 2016-08-23 14:31:22 +02:00
Wilfried Goesgens b4d49c5ba8 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-08-23 14:06:15 +02:00
Andreas Streichardt a9253c7ba5 Coorect agency path (no more / duplicates) 2016-08-23 14:03:41 +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
Andreas Streichardt 47a0f8602a Better shutdown handling 2016-08-23 12:51:38 +02:00
Wilfried Goesgens 1e3592d3c3 change build output name once more. 2016-08-23 12:44:40 +02:00
Wilfried Goesgens a8780ff4bb I love you too, Richard. 2016-08-23 12:17:56 +02:00
Wilfried Goesgens f24b05806e Add uname -o to the filename to make shure build pipelines pick the right ones. 2016-08-23 12:16:32 +02:00
jsteemann 7e43a20727 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:13:17 +02:00
jsteemann 5f06a5c025 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:13:08 +02:00
jsteemann 405a66a269 fix default value for compactionStepSize 2016-08-23 12:08:10 +02:00
jsteemann 817fa1cdf4 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:04:31 +02:00
Andreas Streichardt 5579eca2df Change debug levels for shard sync...no more spam 2016-08-23 10:53:14 +02:00
Wilfried Goesgens 9bdd84324a Add explanation what to make edges and what vertices. 2016-08-23 10:49:37 +02:00
Jan Steemann 57fa55921c fix execution of AQL traversal expressions when there are multiple conditions that refer to variables set outside the traversal 2016-08-23 10:48:08 +02:00
Jan Christoph Uhde 86f887db92 even more error messages 2016-08-23 09:33:03 +02:00
Simran Brucherseifer d07c3c848c Docs: Add dynamic attribute name example and x-ref to RETURN 2016-08-22 20:59:54 +02:00
Simran Brucherseifer 1e6503d1e0 Docs: Access current/OLD value in UPDATE 2016-08-22 20:59:54 +02:00
Simran Brucherseifer a542735683 Fix docs: INSERT does not have a WITH part 2016-08-22 20:59:54 +02:00
Simran Brucherseifer de6e49571e Optimized arangosh tutorial for 80 char width, slightly extended 2016-08-22 20:59:54 +02:00
Jan Steemann 5dd8c8feee throw exception in StringBuffer ctor when no memory is available 2016-08-22 17:36:12 +02:00
Jan Steemann b296468a18 more optimizations 2016-08-22 17:36:04 +02:00
Wilfried Goesgens 7f07678bf7 Add missing arangosh shebang documentation 2016-08-22 16:58:24 +02:00
Andreas Streichardt 997a4e688f Handle backend unavailable properly 2016-08-22 14:15:15 +02:00
Andreas Streichardt de81745985 Reintroduce propagateInstanceInfo 2016-08-22 12:12:19 +02:00
Andreas Streichardt 374f24fbd7 Remove implicit cast 2016-08-22 11:05:19 +02:00