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

39096 Commits

Author SHA1 Message Date
Simon Grätzer b5c7906dce Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 13:32:17 +02:00
Simon Grätzer 02e41de608 Working on replication 2017-04-26 13:32:12 +02:00
jsteemann 48526109b5 removed outdated file 2017-04-26 13:31:08 +02:00
jsteemann 1328142509 updated release notes 2017-04-26 13:26:55 +02:00
jsteemann 4479f38581 updated CHANGELOG 2017-04-26 13:21:56 +02:00
jsteemann 0b8521f186 updated CHANGELOG 2017-04-26 13:14:51 +02:00
hkernbach 575ada7f2b removed console logs 2017-04-26 12:16:14 +02:00
hkernbach 1543f9a7a2 CHANGELOG 2017-04-26 12:14:35 +02:00
hkernbach a01e4a014a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 12:12:41 +02:00
hkernbach 25083059c7 fixed issue: #2453 2017-04-26 12:12:02 +02:00
jsteemann 99dc29d0e6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 12:11:37 +02:00
jsteemann b7de569a27 change log level for debugging 2017-04-26 12:07:28 +02:00
Kaveh Vahedipour 27275e3686 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 12:07:03 +02:00
Kaveh Vahedipour 0d96ba4f4b merge from 3.1 2017-04-26 12:06:43 +02:00
Simon Grätzer a8285641fb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 11:30:44 +02:00
jsteemann d3c165cb8f allow periodic tasks to cancel themselves 2017-04-26 11:28:43 +02:00
Simon Grätzer 6472c4928d Various warnings 2017-04-26 11:26:08 +02:00
Frank Celler ab7bcfe224 --server.maximal-queue-size is now an absolute maximum 2017-04-26 11:20:56 +02:00
Max Neunhoeffer 067a4510a8 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 11:17:24 +02:00
Max Neunhoeffer d3f492158c Port 3.1 fixes to devel, move something into try block. 2017-04-26 11:17:08 +02:00
jsteemann 7283e0d793 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 11:15:42 +02:00
jsteemann 664c6fc83c added more marker types 2017-04-26 11:15:33 +02:00
Jan Christoph Uhde 42eb179e76 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb: (25 commits)
  fix writing of crash summary textfile
  reduce lines in output
  give the system some time to write the core dumps
  Removed double include due to hidden merge conflict.
  db._explain should now be backwards-compatible if we access a 3.1 instance with a 3.2 arangosh
  Port 3.1 changes to devel, startStandAloneAgency.sh.
  add missing include files
  Fixed missing includes
  Fixed compile bugin shortest path
  Fix compile bug
  ShortestPathBlock does not use EdgeCollectionInfo anymore. Replaced by EdgeCursors
  ClusterComm cherry pick from 3.1
  Port 3.1 fixes to devel, new test.
  Port 3.1 fixes to devel, update tests.
  Further unnecessary friends and member variables removed
  Port 3.1 fixes to devel, add an access method.
  disable currently unused variable
  remove useless variable
  Port 3.1 fixes to devel, support setting the agencyPrefix again.
  Port 3.1 fixes to devel, typo.
  ...
 2017-04-26 11:08:59 +02:00
Wilfried Goesgens 0b7e07f096 fix writing of crash summary textfile 2017-04-26 11:08:21 +02:00
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
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