1
0
Fork 0
Commit Graph

33269 Commits

Author SHA1 Message Date
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
Jan Christoph Uhde e2d41278af slightly better error messages 2016-08-22 09:18:35 +02:00
Jan Christoph Uhde 63c4986535 better exceptions form event loop 2016-08-22 08:58:16 +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
Kaveh Vahedipour bb70ed3b8f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-19 18:00:21 +02:00
Kaveh Vahedipour 7c706ecdc8 weekend edition 2016-08-19 17:59:58 +02:00
Wilfried Goesgens 71db758e35 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-19 17:39:14 +02:00
Wilfried Goesgens f63101ee23 one more md5 fix 2016-08-19 17:34:09 +02:00
Wilfried Goesgens 27fbe375f9 Fix md5 detection 2016-08-19 17:33:12 +02:00
Wilfried Goesgens 36edfdf5c3 fix permissions 2016-08-19 17:31:26 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Wilfried Goesgens cc8c1205b1 Implement mac deployment scripts 2016-08-19 17:11:18 +02:00
Andreas Streichardt 66e1bf7e4a Introduce --agency.my-address 2016-08-19 16:20:10 +02:00
Michael Hackstein a788796280 Fixes #1995. The edgeCollectionRestriction was not properly forwarded in commonNeighbors case for new graph features. 2016-08-19 15:40:15 +02:00
jsteemann 1b0d40eff2 cppcheck 2016-08-19 15:27:47 +02:00
jsteemann ff45c3fd07 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 15:19:51 +02:00
jsteemann 9f424553ca stub implementation for engine-specific collections 2016-08-19 15:19:23 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
2016-08-19 14:35:05 +02:00
Kaveh Vahedipour 168431b6ba dumb warnings 2016-08-19 14:29:57 +02:00
Jan Christoph Uhde e2cc11e22a better reporting of errors 2016-08-19 14:23:11 +02:00
Kaveh Vahedipour 4b7846e455 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-19 14:21:44 +02:00
Kaveh Vahedipour 761b986312 warnings and correct handling of pool size 2016-08-19 14:19:56 +02:00