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

33672 Commits

Author SHA1 Message Date
Michael Hackstein 8d48ceca36 Fixed undefined behaviour on Mac. An empty vector was popped. 2016-09-12 16:45:29 +02:00
Max Neunhoeffer b686f23cb9 Set agencySize back to 1 (temporarily). 2016-09-12 14:12:49 +02:00
Michael Hackstein 8dd3105762 Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however. 2016-09-12 13:42:08 +02:00
Max Neunhoeffer ed4ee8be57 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-09-12 12:37:28 +02:00
Max Neunhoeffer 1c7ed5d86f Make testing.js find enterprise tests in enterprise version. 2016-09-12 12:20:50 +02:00
Max Neunhoeffer 0130c0d978 Add global.ARANGODB_CLIENT_VERSION to arangosh. 2016-09-12 12:19:00 +02:00
Max Neunhoeffer 9b6f431ee5 Silence gitjslint.sh tool w.r.t. warnings. 2016-09-12 11:21:23 +02:00
Kaveh Vahedipour 7e5bd6f868 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-12 10:38:47 +02:00
Kaveh Vahedipour 69d946e8c9 reformat 2016-09-12 10:38:36 +02:00
Max Neunhoeffer 04f7e34d8d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-09-12 10:05:00 +02:00
Max Neunhoeffer 4d1e7c5328 Fix which attribute names are allowed for shardKeys. 2016-09-12 10:04:45 +02:00
Simran Brucherseifer 8d857e9513 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-12 09:53:20 +02:00
Simran Brucherseifer 3b9c8fb4d5 Typo fixes in docs 2016-09-12 09:52:36 +02:00
hkernbach a620690a32 grunt build 2016-09-09 17:29:09 +02:00
hkernbach a7c7ce2b59 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-09-09 17:27:53 +02:00
hkernbach 8546c56ff7 improved gv 2016-09-09 17:27:43 +02:00
hkernbach 294f117dbf added missing collection state - frontend 2016-09-09 17:27:02 +02:00
Max Neunhoeffer 9539f2fec6 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-09-09 16:50:18 +02:00
Max Neunhoeffer d7ab888046 Cleanup hash function for attributes. Prepare enterprise. 2016-09-09 16:49:02 +02:00
Jan Christoph Uhde 61c6e3b9df Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  more robust network independance in RAFT election cycle
  more robust network independance in RAFT election cycle
 2016-09-09 16:08:53 +02:00
Jan Christoph Uhde c0d254af03 reply when auth is not enabled 2016-09-09 16:08:30 +02:00
Kaveh Vahedipour 8a3f3c026c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-09 16:03:07 +02:00
Kaveh Vahedipour fb1a729c1b more robust network independance in RAFT election cycle 2016-09-09 16:02:58 +02:00
Kaveh Vahedipour e0de07b403 more robust network independance in RAFT election cycle 2016-09-09 15:59:58 +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
jsteemann 2761b7daaf fix compile error 2016-09-09 15:20:19 +02:00
Jan Christoph Uhde 0147d8fa92 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  changed dir structure
  fixed cppcheck warnings
  agency supervision turned off for quickietest
  multi-host agency in tests
  allow version query with details from shell
  Allow for detailed version query in arangosh.
 2016-09-09 15:15:06 +02:00
Jan Christoph Uhde b220b31bbd fix error found by cppcheck 2016-09-09 15:14:42 +02:00
Jan Christoph Uhde ca5a1ac104 update cppcheck script 2016-09-09 15:13:33 +02:00
Frank Celler 4cebbf985b changed dir structure 2016-09-09 15:08:48 +02:00
Frank Celler eed90fc588 fixed cppcheck warnings 2016-09-09 15:08:48 +02:00
Kaveh Vahedipour 8b6f0e1f51 agency supervision turned off for quickietest 2016-09-09 15:03:12 +02:00
Kaveh Vahedipour b98975344d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-09 14:47:07 +02:00
Kaveh Vahedipour 16a35ee15a multi-host agency in tests 2016-09-09 14:46:54 +02:00
jsteemann c30860b39e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-09 14:32:29 +02:00
jsteemann 5800a2901d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-09 14:31:20 +02:00
Max Neunhoeffer 8353b6b42d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-09-09 14:31:13 +02:00
jsteemann 1085642b50 allow version query with details from shell 2016-09-09 14:30:59 +02:00
Max Neunhoeffer 8fef636106 Allow for detailed version query in arangosh. 2016-09-09 14:30:57 +02:00
Jan Christoph Uhde 0d2a1e6298 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  assert
  don't crash when lock request fails
  fixed recovery of "older" collections
  changelog
  fixed issue #2005
  improved gv
 2016-09-09 14:11:37 +02:00
Jan Christoph Uhde b06666c5e5 fix compiler warning 2016-09-09 14:11:20 +02:00
jsteemann 1fcc5b18f7 assert 2016-09-09 13:57:34 +02:00
Jan Steemann 884b6d5d58 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-09 13:47:41 +02:00
Jan Steemann 6ebfdf5e1e don't crash when lock request fails 2016-09-09 13:47:21 +02:00
Jan Steemann 1095843596 fixed recovery of "older" collections 2016-09-09 13:46:39 +02:00
hkernbach a3ffd9e59d changelog 2016-09-09 13:41:29 +02:00
hkernbach ee65a1a375 fixed issue #2005 2016-09-09 13:39:15 +02:00
hkernbach c8923c1021 improved gv 2016-09-09 13:16:57 +02:00
Jan Christoph Uhde 035d736fc0 Revert "fix bug with missing agents" 
This reverts commit e230e3e2c5.
 2016-09-09 12:59:25 +02:00