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

11025 Commits

Author SHA1 Message Date
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
jsteemann 29170414a2 removed unused property 2016-09-01 10:40:29 +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 cf2370b820 use unique_ptr 2016-09-01 08:42:10 +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
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
Michael Hackstein a47c5df5d0 Now the logical collection actually reads the planId if it existing. 2016-08-31 14:42:20 +02:00
jsteemann 89ac2dfba5 don't leak on help 2016-08-31 14:28:23 +02:00
Michael Hackstein 4d53f29d9e Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-31 13:54:32 +02:00
Michael Hackstein 0401fdf1e4 Fixed reading an index in cluster. It is not yet possible to create a new one 2016-08-31 13:54:06 +02:00
Michael Hackstein d7bdf8e066 Fixed a logic bug to identify if a collection is a shard or a real local collection on DBServer 2016-08-31 13:19:16 +02:00
Andreas Streichardt a14935aca3 Handle 503 answer from dbservers properly 2016-08-31 11:24:23 +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
Kaveh Vahedipour 676e5b1329 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-31 08:34:21 +00:00
jsteemann a04934ce50 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:09 +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 a2048f1255 fix bitshifting 2016-08-30 17:27:50 +02:00
jsteemann 0ccee3b412 nicer hex output 2016-08-30 17:08:50 +02:00
jsteemann baad30fdb7 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:47:35 +02:00
Michael Hackstein 4175c6eb65 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 16:37:26 +02:00
Michael Hackstein 8fa571073e Index creation now actually writes index files on logical collection 2016-08-30 16:37:12 +02:00
Jan Steemann 226ed6d17a slighty improved error handling in import API 2016-08-30 16:33:44 +02:00
jsteemann ea9124eb51 fixed dump test 2016-08-30 16:32:20 +02:00
jsteemann 1bc8ce1060 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:28:11 +02:00
Michael Hackstein 8bced11a07 Potential assertion fix on planId 2016-08-30 16:27:54 +02:00
jsteemann b2eadbd179 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:07:50 +02:00
jsteemann 7223179b7f Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:07:44 +02:00
jsteemann 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
Michael Hackstein 0e840afcb6 Removed obsolete constructor 2016-08-30 15:48:25 +02:00
Michael Hackstein 277953489c Fixed now false checks on planId == 0 for SingleServer case. This is not true any more 2016-08-30 15:37:26 +02:00
Jan Steemann b7be5d5cfb fixed issue #2026 2016-08-30 15:14:16 +02:00
Kaveh Vahedipour c8178239e1 agency configuration persisted to state machine 2016-08-30 14:41:28 +02:00