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

14356 Commits

Author SHA1 Message Date
jsteemann 81c629a685 fixed memleak 2017-04-27 08:54:19 +02:00
Dan Larkin 6296f88c05 Added stub handler for PutLogData. 2017-04-26 22:49:32 -04:00
Dan Larkin da30cf862e Updated document markers. 2017-04-26 16:25:12 -04:00
Dan Larkin cc92d280f6 Added document insert/remove markers. 2017-04-26 16:14:15 -04:00
Dan Larkin f8efe6e627 Added create index and change collection marker creation. 2017-04-26 15:23:25 -04:00
Michael Hackstein 5ef52aefe8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 18:32:38 +02:00
Michael Hackstein e423a5fde1 Added WAL MARKERS for CreateCollection, RenameCollection and DropIndex, also adjested WalMarkerType constructors. 2017-04-26 18:32:28 +02:00
jsteemann e358c38784 make ctor explicit, dont copy parameters 2017-04-26 16:24:11 +02:00
Kaveh Vahedipour f6e5d0f882 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 15:32:56 +02:00
Kaveh Vahedipour 68efba18e8 keep agencyPrefix, when non set 2017-04-26 15:32:26 +02:00
Frank Celler 33fda9275c Merge pull request #2451 from arangodb/feature/ldap-auth 
Feature/ldap auth
 2017-04-26 14:12:32 +02:00
jsteemann 631be66ba8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 13:37:51 +02:00
jsteemann 9161d48788 changed option description 2017-04-26 13:37:40 +02:00
Simon Grätzer 02e41de608 Working on replication 2017-04-26 13:32:12 +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
Max Neunhoeffer 855d7cf1c2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 11:07:24 +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
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 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