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

437 Commits

Author SHA1 Message Date
Michael Hackstein 344979709e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 09:36:09 +02:00
Michael Hackstein 52b3b67479 Fixed cluster restore of System Collections. 2017-04-26 08:58:17 +02:00
Jan Christoph Uhde 26112be584 do checking before creating copy of slice 2017-04-26 08:33:23 +02:00
Jan Christoph Uhde 7b2acaebfb use stringref instead of allocation 2017-04-26 07:33:14 +02:00
Dan Larkin c11857df09 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-25 13:58:47 -04:00
Dan Larkin 9dd275b497 Fixed dump/restore tests. 2017-04-25 13:54:56 -04:00
jsteemann 7344a03623 fix crashes 2017-04-25 15:47:11 +02:00
Jan Christoph Uhde fca8f01df6 create logger state just in one place 2017-04-25 14:58:32 +02:00
Simon Grätzer 3c6074a206 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 13:33:36 +02:00
jsteemann 861291da16 honor exclusive locks 2017-04-25 12:56:56 +02:00
Simon Grätzer 8aaac6d5a2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 12:02:04 +02:00
Simon Grätzer 5d20b79c0f Incremental Sync 2017-04-25 12:01:58 +02:00
Jan Christoph Uhde e5447d2e8c prevent crashing of replication when not using mmfiles engine 2017-04-25 11:11:58 +02:00
jsteemann 0434d88ab4 rocksdb options 2017-04-25 02:22:00 +02:00
jsteemann 4300c77d3e fixes for non-array IN lookups, added tests 2017-04-25 01:47:07 +02:00
jsteemann fe1268af97 added missing return 2017-04-24 23:30:57 +02:00
jsteemann d1cad2acc9 cppcheck 
fix
 2017-04-24 23:06:36 +02:00
Dan Larkin a17de4e296 Added a missing switch break. 2017-04-24 16:36:50 -04:00
Simon Grätzer 91fe0f01ea formatting 2017-04-24 15:55:21 +02:00
Simon Grätzer fe84b499c0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel 2017-04-24 15:45:39 +02:00
Simon Grätzer 7176d34169 Fixed incremental synced 2017-04-24 15:40:48 +02:00
jsteemann af9a214c9f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-24 14:23:54 +02:00
jsteemann b7bf8a8983 implement basic operations for settings 2017-04-24 14:19:29 +02:00
Michael Hackstein 6cfa55ac6c Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-04-24 13:54:42 +02:00
jsteemann 507054de99 adjust include order 2017-04-24 13:50:54 +02:00
jsteemann fcc61115d8 try to fix feature startup order (Scheduler vs. CacheManager vs. DatabaseFeature) 2017-04-24 13:17:21 +02:00
Simon Grätzer 06fea9dbf4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-24 12:43:55 +02:00
Simon Grätzer 88dc999001 Counter manager fixes 2017-04-24 12:43:44 +02:00
Jan Christoph Uhde 2269ca7b0a add batchId and logging 2017-04-24 11:47:54 +02:00
Simon Grätzer df57b291f8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-24 10:23:33 +02:00
jsteemann a32c2e84d4 use adjusted write options on commit 2017-04-24 09:39:35 +02:00
Dan Larkin 7c49b6bdd4 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 13:12:25 -04:00
Dan Larkin d7f56172fd Fixed a status return in replication handler. 2017-04-21 13:12:19 -04:00
jsteemann d0fae3cf7b savepoint optimizations 2017-04-21 18:23:47 +02:00
Simon Grätzer 1265fb759c Merge + sync 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBReplicationContext.h
 2017-04-21 18:11:01 +02:00
Simon Grätzer e850dd635a Incremental sync 2017-04-21 18:10:10 +02:00
Dan Larkin 557eddb912 Added batchSize support to collection dumping. 2017-04-21 11:51:56 -04:00
jsteemann 361d513087 re-enable user settings for RocksDB 2017-04-21 15:28:29 +02:00
jsteemann 0444a5a068 disable usage of (bad) default values 2017-04-21 14:02:50 +02:00
Simon Grätzer ff4f8181dd Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 13:00:36 +02:00
Simon Grätzer 235f006a27 const collection CRUD methods 2017-04-21 13:00:30 +02:00
Simon Grätzer 064c51c731 Adding const statements 2017-04-21 12:59:20 +02:00
jsteemann 862ec7bae3 remove log garbage 2017-04-21 12:57:20 +02:00
jsteemann 5d86a729c0 fix dump format 2017-04-21 11:09:06 +02:00
jsteemann 498ace382a remove debug log messages 2017-04-21 10:00:39 +02:00
Dan Larkin 30efe6c136 Made more progress on dump tests. 2017-04-20 23:05:56 -04:00
Dan Larkin c46d4c6a6f Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 18:04:36 -04:00
Dan Larkin 9d6aa4b297 Some more replication handler changes. 2017-04-20 18:04:33 -04:00
jsteemann c0348c2840 more fixes 2017-04-20 23:23:04 +02:00
jsteemann 493154a319 fix inventory when there is no batchId 2017-04-20 23:14:58 +02:00