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

612 Commits

Author SHA1 Message Date
jsteemann df808cd665 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
jsteemann cf1023eb98 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:42:58 +02:00
Kaveh Vahedipour 682a99a063 Added missing classes 2016-09-05 11:15:47 +02:00
Kaveh Vahedipour f066ff9920 looks good for dangling creation of shards 2016-09-05 11:03:37 +02:00
Kaveh Vahedipour f0023d70e1 half way through unassumed leadership 2016-09-02 17:38:49 +02:00
jsteemann 4492409d5f Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-02 15:23:15 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +02:00
Kaveh Vahedipour e669de0f70 removed bug into failedserver 2016-09-02 14:39:15 +02:00
Kaveh Vahedipour b3b7d7c907 failed servers are excluded from new shard creation 2016-09-02 12:37:53 +02:00
Kaveh Vahedipour 3603a6d63d failed server entry in target and plan increase until resolution 2016-09-02 09:28:08 +02:00
jsteemann 3ac79c8132 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 15:08:42 +02:00
Kaveh Vahedipour 6239a5fbc5 minor reorganisation 2016-09-01 13:45:15 +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 9591882cee don't throw 2016-09-01 11:26:09 +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
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
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
jsteemann fa21e70256 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:54 +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 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
Kaveh Vahedipour c8178239e1 agency configuration persisted to state machine 2016-08-30 14:41:28 +02:00
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
Michael Hackstein 82edb8707a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 10:12:36 +02:00
jsteemann bd590fb62d Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 08:18:34 +02:00
Michael Hackstein 7cf7b89c6d Removed more usage of VocbaseCollectionInfo and replaced it by LogicalCollection. It's getting better now. State still not green. 2016-08-29 18:44:34 +02:00
Kaveh Vahedipour c53428ce89 minor fixes 2016-08-29 17:13:33 +02:00
Kaveh Vahedipour b94f17fb21 minor timing 2016-08-26 15:30:26 +00:00
Kaveh Vahedipour d7334c5616 minor timing 2016-08-26 15:29:41 +00:00
jsteemann 37258adb57 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 16:37:25 +02:00
Kaveh Vahedipour fb6e651525 Adding Foxx access to agency 2016-08-26 16:28:42 +02:00
Kaveh Vahedipour e07543c2e2 Adding Foxx access to agency 2016-08-26 16:25:03 +02:00
jsteemann 22b1b7b7e7 added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
jsteemann 4b53310189 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 13:42:40 +02:00
Kaveh Vahedipour b409a1ff25 Adding Foxx access to agenc 2016-08-26 13:35:39 +02:00
jsteemann 257aefc5c5 fix agency shutdown 2016-08-25 14:06:08 +02:00
jsteemann c6efe26198 cppcheck 2016-08-25 14:04:23 +02:00
jsteemann 667dc8af49 fix agency shutdown 2016-08-25 14:04:11 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
Andreas Streichardt 89ebeefbb9 Proper shutdown 2016-08-24 13:51:23 +02:00
root c7f8046e48 raft bug. leader ship cannot be rendered to higher term and lower index. 2016-08-24 09:26:34 +00:00
jsteemann 6fc162d5a1 fix compile errors after merge 2016-08-24 09:44:05 +02:00