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

39481 Commits

Author SHA1 Message Date
Max Neunhoeffer 855d7cf1c2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 11:07:24 +02:00
Wilfried Goesgens 6abef15252 reduce lines in output 2017-04-26 11:07:20 +02:00
Wilfried Goesgens 0ec9dd444c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 11:06:37 +02:00
Wilfried Goesgens 3c23a83f4e give the system some time to write the core dumps 2017-04-26 11:06:30 +02:00
Max Neunhoeffer c12878b1f0 Port 3.1 changes to devel, JS support AddFollower/RemoveFollower for tests. 2017-04-26 11:06:24 +02:00
Simon Grätzer f31e3c3688 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 11:06:13 +02:00
Simon Grätzer d228a94462 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Replication/InitialSyncer.cpp
 2017-04-26 11:06:09 +02:00
Michael Hackstein 5beae6081b Removed double include due to hidden merge conflict. 2017-04-26 11:04:01 +02:00
Michael Hackstein 094be54826 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 11:01:20 +02:00
Michael Hackstein 2e417a1576 db._explain should now be backwards-compatible if we access a 3.1 instance with a 3.2 arangosh 2017-04-26 11:01:05 +02:00
Jan Christoph Uhde d1051f13cd add batchId to dump for for shards 2017-04-26 11:01:03 +02:00
Max Neunhoeffer 7a03071444 Port 3.1 changes to devel, startStandAloneAgency.sh. 2017-04-26 10:53:43 +02:00
baslr f45a7f07b1 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-26 10:52:50 +02:00
jsteemann b349eaf34a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:40:14 +02:00
jsteemann b226dfdc9a add missing include files 2017-04-26 10:40:04 +02:00
Michael Hackstein e891c66c88 Fixed missing includes 2017-04-26 10:39:10 +02:00
jsteemann 19129835f2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:33:03 +02:00
Michael Hackstein aed90940d0 Fixed compile bugin shortest path 2017-04-26 10:32:40 +02:00
Kaveh Vahedipour d9f0e7bf2a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:28:27 +02:00
Kaveh Vahedipour 8f2fbd6b3c Fix compile bug 2017-04-26 10:27:52 +02:00
jsteemann 5cf3787c8d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:23:01 +02:00
Michael Hackstein 6e949f97e7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 10:22:22 +02:00
Michael Hackstein 9e1eba3bde ShortestPathBlock does not use EdgeCollectionInfo anymore. Replaced by EdgeCursors 2017-04-26 10:21:18 +02:00
Kaveh Vahedipour 5f7cc6de59 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:20:27 +02:00
Kaveh Vahedipour 7aceac2f56 ClusterComm cherry pick from 3.1 2017-04-26 10:20:21 +02:00
jsteemann 46da4b938f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:19:29 +02:00
Max Neunhoeffer 96615132e4 Port 3.1 fixes to devel, new test. 2017-04-26 10:19:05 +02:00
Max Neunhoeffer b6df2002e6 Port 3.1 fixes to devel, update tests. 2017-04-26 10:13:35 +02:00
jsteemann 59d08c79cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:12:58 +02:00
Max Neunhoeffer ed13ee7973 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 10:10:06 +02:00
Michael Hackstein 4c58817cc7 Further unnecessary friends and member variables removed 2017-04-26 10:10:05 +02:00
Max Neunhoeffer 17a88ddbf8 Port 3.1 fixes to devel, add an access method. 2017-04-26 10:09:47 +02:00
jsteemann e42144f93d disable currently unused variable 2017-04-26 10:09:35 +02:00
Andreas Streichardt 42577df48d remove useless variable 2017-04-26 10:07:51 +02:00
Michael Hackstein 9ee17fea5a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 10:06:38 +02:00
Max Neunhoeffer 63d51b9ae4 Port 3.1 fixes to devel, support setting the agencyPrefix again. 2017-04-26 10:03:20 +02:00
Max Neunhoeffer db3195e736 Port 3.1 fixes to devel, typo. 2017-04-26 10:02:41 +02:00
jsteemann 618951cc44 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:02:30 +02:00
Michael Hackstein d3517eb491 Removed unnecessary friend declaration 2017-04-26 10:02:20 +02:00
Max Neunhoeffer bf2e5f30ca Port 3.1 fixes to devel, shortName translation. 2017-04-26 10:02:14 +02:00
Max Neunhoeffer bf082b8e2c Port 3.1 fixes to devel, <coll>.properties() method. 2017-04-26 10:01:41 +02:00
Wilfried Goesgens decb36d8bc force windows to run 64 bit compiler & linkers 2017-04-26 10:00:30 +02:00
jsteemann 6b8c818e2d remove unused variable 2017-04-26 09:59:19 +02:00
jsteemann 178171033f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 09:58:26 +02:00
jsteemann f36a889709 try to fix shutdown issues 2017-04-26 09:58:19 +02:00
Andreas Streichardt ed0e9fdc8e Set waiting to false until tests are changed 2017-04-26 09:57:40 +02:00
Andreas Streichardt dad5a1429e Add waitForSyncReplication as a _create() option 2017-04-26 09:57:40 +02:00
Frank Celler 1ac30babf5 raised statistics entries 2017-04-26 09:54:14 +02:00
Max Neunhoeffer 6ac6c3c859 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 09:52:37 +02:00
Michael Hackstein f876eef088 Removed unused member variable in ShortestPathBlock 2017-04-26 09:52:00 +02:00