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

33231 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
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
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
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
servusoft 2ec8ae8698 Set host_arch by CROSS_COMPILING 2016-08-31 14:24:15 +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
Wilfried Goesgens 41832d6334 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-31 12:06:25 +02:00
Wilfried Goesgens 9359b6f652 Abort compilation process if the cmake configure run fails 2016-08-31 12:05:24 +02:00
Andreas Streichardt 80cc0aea55 || exit 1 2016-08-31 11:57:28 +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
Wilfried Goesgens 16f03bb747 Add cxgcc snippets 2016-08-31 10:08:22 +02:00
jsteemann 32d74c3ac3 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:14 +02: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
Wilfried Goesgens 3c3a941bea Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-30 17:46:54 +02:00
Wilfried Goesgens 1a841feb1a fix users home directory. 2016-08-30 17:46:29 +02:00
Wilfried Goesgens b4ddb77d58 Fix debian scripted password documentation. 2016-08-30 17:31:49 +02:00