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

33634 Commits

Author SHA1 Message Date
Michael Hackstein ba460f3675 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-01 14:12:00 +02:00
Michael Hackstein 092c3ef573 ClusterInfo get collection now throws NOT_FOUND if the collection is not found instead of nullptr. 2016-09-01 14:11:52 +02:00
Jan Christoph Uhde 4ea15c7caf fix BatchHander for vpp by reporting that it is not implemented 2016-09-01 13:56:46 +02:00
Kaveh Vahedipour 6239a5fbc5 minor reorganisation 2016-09-01 13:45:15 +02:00
Jan Christoph Uhde ee10949dcf fix cursor test for vpp 2016-09-01 12:12:28 +02:00
jsteemann 68ae8d2945 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 12:02:50 +02:00
Jan Steemann d57c3ef792 removed unused method 2016-09-01 12:02:24 +02:00
Michael Hackstein 36804cc30a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-09-01 11:42:31 +02:00
Michael Hackstein 81bc1c67e7 Fixed filtered edges for an empty list of expressions. 2016-09-01 11:40:48 +02:00
Michael Hackstein f53a308c4d Improved callbacks in Cluster when creating indexes. It will now only register the callback if the index is actually trying to be created. 2016-09-01 11:39:42 +02:00
Jan Christoph Uhde 5092c08e6d fix requests where nobody is available 2016-09-01 11:28:46 +02:00
Jan Steemann 577c2aee11 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-01 11:26:18 +02:00
Jan Steemann 9591882cee don't throw 2016-09-01 11:26:09 +02:00
Andreas Streichardt 3bcd9f1cc8 try...catch in heartbeat...heartbeat must be running 2016-09-01 11:23:49 +02:00
Jan Steemann a2f0b0a49f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-01 11:20:15 +02:00
Jan Steemann e03d550985 removed unused methods 2016-09-01 11:19:55 +02:00
Wilfried Goesgens 3294708cb8 explain ditaa integration. 2016-09-01 10:50:45 +02:00
jsteemann e6e5aacd05 fix after merge 2016-09-01 10:50:11 +02:00
jsteemann fb04340937 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 10:47:44 +02:00
jsteemann 4a911768dd fix some issues in shutdown 2016-09-01 10:46:45 +02:00
Kaveh Vahedipour cf742369aa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-01 08:45:09 +00:00
jsteemann 29170414a2 removed unused property 2016-09-01 10:40:29 +02:00
Wilfried Goesgens 4c04e0af35 Remove duplicate RESTURLPARAMS leading to errnous header outputs 2016-09-01 10:33:22 +02:00
jsteemann 2eaf7196e2 fixed some tests 2016-09-01 09:41:11 +02:00
Kaveh Vahedipour 51da548a6b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-01 07:37:00 +00:00
Kaveh Vahedipour 804c30803f RAFT read bug in leader isolation 2016-09-01 09:35:17 +02:00
Kaveh Vahedipour 48099cf067 merging back into jepsen impl 2016-09-01 07:22:30 +00:00
Kaveh Vahedipour a19314f27e geez 2016-09-01 07:20:22 +00:00
Kaveh Vahedipour 4f98c4dd49 RAFT read bug 2016-09-01 09:18:44 +02:00
jsteemann 8e0a59285b fix recovery tests 2016-09-01 09:15:34 +02:00
jsteemann 4cef5d86fb Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 09:06:15 +02:00
jsteemann be820ac927 fix freeing of nullptr 2016-09-01 08:42:17 +02:00
jsteemann cf2370b820 use unique_ptr 2016-09-01 08:42:10 +02:00
jsteemann 149ef4ab8b fix freeing of nullptr 2016-09-01 08:39:44 +02:00
Jan Christoph Uhde c98f83ede3 fix RestSimpleHandler 2016-08-31 18:52:58 +02:00
Jan Christoph Uhde 69318fc56c Merge branch 'devel' of github.com:arangodb/arangodb into obi-velocystream-try-merge-devel 
* 'devel' of github.com:arangodb/arangodb:
  fixed issue with leadership  in minority
  Set host_arch by CROSS_COMPILING
  agency configuration persisted to state machine
 2016-08-31 18:23:31 +02:00
Jan Christoph Uhde 59ad47d717 make more efficient use of setPayload 2016-08-31 18:22:13 +02:00
jsteemann 26101187e8 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:59 +02:00
jsteemann fa21e70256 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:54 +02:00
jsteemann 0e15e5c25c fixed leak 2016-08-31 17:30:29 +02:00
Kaveh Vahedipour 6c57f4eb67 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-31 15:24:28 +00:00
Kaveh Vahedipour 2550dd22e0 fixed issue with leadership in minority 2016-08-31 17:23:48 +02:00
Kaveh Vahedipour cbe2d51eba Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-31 17:22:25 +02:00
Michael Hackstein 513f6ce560 Now all AGENTs do re port that they are not part of a cluster. This did confuse the statistics.js 2016-08-31 17:20:28 +02:00
Wilfried Goesgens a08c713216 Merge pull request #2030 from servusoft/patch-11 
Set host_arch by CROSS_COMPILING
 2016-08-31 15:49:43 +02:00
jsteemann 797b0fa2b0 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 15:30:58 +02:00
jsteemann 2d1e0bd3ae fixed some leaks 2016-08-31 15:30:47 +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
Michael Hackstein a47c5df5d0 Now the logical collection actually reads the planId if it existing. 2016-08-31 14:42:20 +02:00
Jan Christoph Uhde f09bf540bc change setPayload and add requested ContentType in response 2016-08-31 14:32:04 +02:00