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

14512 Commits

Author SHA1 Message Date
Simon Grätzer c10f5abfc0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBLogValue.cpp
#	arangod/RocksDBEngine/RocksDBLogValue.h
 2017-04-26 23:44:28 +02: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
Simon Grätzer 37cbb80d50 Fixed startup exception 2017-04-26 20:35:20 +02:00
Simon Grätzer b93c294c41 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBLogValue.cpp
 2017-04-26 18:58:29 +02:00
Simon Grätzer 29286a9c1b RocksDB WAL entries for transactions 2017-04-26 18:54:55 +02: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
Simon Grätzer 69f9052569 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 17:01:51 +02:00
Simon Grätzer 14a3168e40 Working initial sync 2017-04-26 17:01:35 +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
Simon Grätzer 1853447aa0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 14:13:37 +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
Simon Grätzer bdd002d6ec Fixing incremental sync deletion 2017-04-26 14:11:51 +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
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
Michael Hackstein d3517eb491 Removed unnecessary friend declaration 2017-04-26 10:02:20 +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
Michael Hackstein f876eef088 Removed unused member variable in ShortestPathBlock 2017-04-26 09:52:00 +02:00
jsteemann c617ebddbf honor return value of TRI_vocbase_t::use 2017-04-26 09:51:40 +02:00
jsteemann 404ef431ae cppcheck 2017-04-26 09:50:55 +02:00
jsteemann c59857c2e6 decrease max wait time 2017-04-26 09:50:16 +02:00
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 20dc8b4fa0 Fixed duplicate objectIds in InitialSyncer. 2017-04-25 16:51:38 -04:00
Simon Grätzer 020c3db093 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 20:55:26 +02:00
Simon Grätzer a53025b5a9 Added RocksDB WAL types 2017-04-25 20:55:21 +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
Simon Grätzer 6d358c9b6a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 16:55:44 +02:00
jsteemann 4289105eb3 fix shutdown issue 2017-04-25 16:09:01 +02:00
Simon Grätzer 3aada2afe0 Fixed double handled case 2017-04-25 16:03:51 +02:00
jsteemann 7344a03623 fix crashes 2017-04-25 15:47:11 +02:00
Andreas Streichardt 2b4038953e Remove unused CXX checks (were not in use and cmake has built in support for these) 2017-04-25 15:20:50 +02:00
Jan Christoph Uhde e4b3f5c4ac fix warning 2017-04-25 15:12:22 +02:00
Jan Christoph Uhde e06efa6420 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  fix compile warnings
  Fixed build
  add missing signaling of crashed state
 2017-04-25 15:08:17 +02:00
Jan Christoph Uhde fca8f01df6 create logger state just in one place 2017-04-25 14:58:32 +02:00
jsteemann 26d4fd61db fix compile warnings 2017-04-25 14:56:00 +02:00
Simon Grätzer 4804123e0f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:54:03 +02:00
Simon Grätzer 2f968d649a Fixed build 2017-04-25 14:53:59 +02:00
jsteemann f4972d38ab Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:41:13 +02:00
jsteemann 09e3a19a5b try to fix shutdown issue 2017-04-25 14:41:04 +02:00
Simon Grätzer 284d620c0b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:27:39 +02:00
Simon Grätzer 69c2faf592 Fixed synced 2017-04-25 14:27:34 +02:00
jsteemann 6935b6fe3e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:20:20 +02:00
jsteemann bd5737c5e7 try to fix shutdown issues when collection opening thread is waiting forever for scheduler to finish 2017-04-25 14:20:00 +02:00
baslr 54e2bd6386 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 14:19:05 +02:00
baslr be4da8cd0c ldap random salt for new user 2017-04-25 14:18:44 +02:00
Kaveh Vahedipour d88f990ad0 dropping sharding prototype collection more verbose 2017-04-25 14:17:08 +02:00
Kaveh Vahedipour 999334e366 dropping sharding prototype collection more verbose 2017-04-25 14:13:07 +02:00
Kaveh Vahedipour bf67189d98 dropping sharding prototype collection more verbose 2017-04-25 14:11:44 +02:00
Kaveh Vahedipour 1361e5e6dd dropping sharding prototype collection more verbose 2017-04-25 14:03:26 +02:00
Kaveh Vahedipour 21c1a68702 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 14:00:05 +02:00
Kaveh Vahedipour f0f40b6e8d dropping sharding prototype collection more verbose 2017-04-25 13:59:56 +02:00
baslr a478e6f03c remove ldap feature here 2017-04-25 13:48:57 +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
baslr eda353819a Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 12:45:30 +02:00
jsteemann 9db917bd77 try to fix shutdown issue 2017-04-25 12:28:51 +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
Kaveh Vahedipour bc8f08189b searching for the shutdown problem on mac 2017-04-25 11:53:55 +02:00
baslr 579718ad37 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 11:18:07 +02:00
Jan Christoph Uhde 319a47c64b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  try to fix startup order
 2017-04-25 11:14:45 +02:00
jsteemann 3cdeeffc13 try to fix startup order 2017-04-25 11:14:10 +02:00
Jan Christoph Uhde 17db954a86 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Removed if where if and else were identical
  changelog
  fixed issue: 2448
  all agency threads shutdown in their destructors if not stopping yet
  ui: fixed login windows showing wrong available dbs
  fix bug with ioService gone before hearbeatthread
 2017-04-25 11:12:49 +02:00
Jan Christoph Uhde e5447d2e8c prevent crashing of replication when not using mmfiles engine 2017-04-25 11:11:58 +02:00
Michael Hackstein 9e49f87fe6 Removed if where if and else were identical 2017-04-25 10:10:46 +02:00
Kaveh Vahedipour 7766c44aaa all agency threads shutdown in their destructors if not stopping yet 2017-04-25 09:34:08 +02:00
Kaveh Vahedipour 2e3bd066f3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 08:54:45 +02:00
Kaveh Vahedipour 6ef775e52f fix bug with ioService gone before hearbeatthread 2017-04-25 08:54:33 +02:00
Jan Christoph Uhde 5f31e2b692 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Removed non-applicable test case.
  unused variable
  rocksdb options
  fixes for non-array IN lookups, added tests
  Add check for distributeShardsLike to dropCollectionCoordinator.
  fixed foxx test
  added missing return
  js request simplified if sslProtocol
  pass also sslProtocol from request to internal.download
  fixed issue #2450
  cppcheck
  Added a missing switch break.
  remove dead code
  updated CHANGELOG
  raised to 4
  added 'x-content-type-options: nosniff' to avoid MSIE bug
  fixed queue size
  added queue size to statistics
  added queue time and request tracing with timings
 2017-04-25 08:38:51 +02:00
jsteemann a52a6ff21e unused variable 2017-04-25 02:26:02 +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 ca5d54aa58 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 00:03:05 +02:00
Max Neunhoeffer e16f9ca7c5 Add check for distributeShardsLike to dropCollectionCoordinator. 2017-04-24 23:54:07 +02:00
jsteemann fe1268af97 added missing return 2017-04-24 23:30:57 +02:00
jsteemann 4d6c21f3c5 fixed issue #2450 2017-04-24 23:06:45 +02:00
jsteemann d1cad2acc9 cppcheck 
fix
 2017-04-24 23:06:36 +02:00
Dan Larkin 0ce293bb6a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-24 16:36:53 -04:00
Dan Larkin a17de4e296 Added a missing switch break. 2017-04-24 16:36:50 -04:00
jsteemann 9cdf52c6e9 remove dead code 2017-04-24 21:42:13 +02:00
Jan Christoph Uhde 5c59255c5f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Fixed unnecessary move of temporary object
  fix license / readme filenames
  two ways to name snap packages?
  Fixed TraversalCounting in cluster again. Was removed by accident from totally unrelated commit
  avoid warnings for time being
  fixed exterprise build in devel
 2017-04-24 19:01:42 +02:00
Jan Christoph Uhde 37db67dee5 fix engine name 2017-04-24 19:01:31 +02:00
Frank Celler f94df236a3 added 'x-content-type-options: nosniff' to avoid MSIE bug 2017-04-24 18:47:56 +02:00
Frank Celler 45690bbbdd fixed queue size 2017-04-24 18:47:44 +02:00
Frank Celler 1a4675dfbf added queue size to statistics 2017-04-24 18:47:44 +02:00
Frank Celler d783d4ecae added queue time and request tracing with timings 2017-04-24 18:47:44 +02:00
Michael Hackstein bce4b9ef5d Fixed unnecessary move of temporary object 2017-04-24 18:31:18 +02:00
Jan Christoph Uhde 59ca7abe21 fix JS_StateLoggerReplication -- engine specific code should go into engines 2017-04-24 17:40:50 +02:00
Michael Hackstein 8596cec20b Fixed TraversalCounting in cluster again. Was removed by accident from totally unrelated commit 2017-04-24 16:58:21 +02:00
Kaveh Vahedipour 262bb4faac avoid warnings for time being 2017-04-24 16:49:26 +02:00
Kaveh Vahedipour a514649132 fixed exterprise build in devel 2017-04-24 16:33:53 +02: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
baslr 9a78fc650b Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 15:37:18 +02:00
Kaveh Vahedipour ccc388a940 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:13:40 +02:00
Kaveh Vahedipour c099c6daa9 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:12:38 +02:00
baslr ef75c2ac02 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 15:10:42 +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
baslr 3d9f58bb70 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 12:45:35 +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
Wilfried Goesgens 7cbd1841a8 fix gcc 4.9 compilation issue 2017-04-24 11:25:10 +02:00
jsteemann 603cc849b9 fix attempt for @dothebart'a ancient compiler 2017-04-24 11:12:08 +02:00
Kaveh Vahedipour a211e5ee83 ipv4 is so yesterday 2017-04-24 11:08:04 +02:00
Kaveh Vahedipour 09a6888d14 attempt at fixing shutdown bug on mac os x 2017-04-24 10:45:54 +02:00
Michael Hackstein 9b15e1a913 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-24 10:44:06 +02:00
Michael Hackstein 851f772dc1 Fixed some counting/reporting for AQL statistics in Traverser. 2017-04-24 10:42:40 +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
jsteemann 31c9e04ae6 fixed memleak 2017-04-22 00:28:45 +02:00
jsteemann c197d617d9 proper file order 2017-04-21 20:32:56 +02:00
jsteemann ea8496f1a5 cppcheck 2017-04-21 20:19:36 +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
jsteemann b24f4a9435 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 18:14:31 +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
Andreas Streichardt 7322e3bff3 Allow seeding of randomgenerator for tests 2017-04-21 18:08:49 +02:00
jsteemann c0995c7328 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 18:08:00 +02:00
Dan Larkin 734921f003 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 11:52:07 -04:00
Dan Larkin 557eddb912 Added batchSize support to collection dumping. 2017-04-21 11:51:56 -04:00
Michael Hackstein ac90968c30 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 17:40:18 +02:00
jsteemann 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +02:00
Michael Hackstein 3b34d4edec Unified static-counting for Traversals on the Cache 2017-04-21 15:58:44 +02:00
Kaveh Vahedipour 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann 361d513087 re-enable user settings for RocksDB 2017-04-21 15:28:29 +02:00
baslr e275112601 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 15:20:39 +02:00
Michael Hackstein e46642fce1 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 15:06:42 +02:00
Michael Hackstein aa2abe0c1d Fixed a bug in TraverserOptions when using more than one edge collection and a specific filter on depth. 2017-04-21 15:06:24 +02:00
jsteemann 0444a5a068 disable usage of (bad) default values 2017-04-21 14:02:50 +02:00
baslr 8749276b02 include ldaplib if enterprise 2017-04-21 13:58:58 +02:00
jsteemann b33390c1d4 remove log spam 2017-04-21 13:21:38 +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 691dac7a73 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 12:35:07 +02:00
Kaveh Vahedipour 2dbd179656 Fix ocasionally hangling shut down on mac 2017-04-21 11:49:22 +02:00
baslr 76eeef7bd0 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 11:37:45 +02:00
Michael Hackstein e3beaaa8fc Added a test + fix for a Stackoverflow issue in Traversals and ShortestPath in AQL. This occured in the case where there are a lot of starting vertices in a row that do not have any paths attached to them. Fixes: #2445 2017-04-21 11:31:30 +02:00
jsteemann 5d86a729c0 fix dump format 2017-04-21 11:09:06 +02:00