1
0
Fork 0
Commit Graph

39295 Commits

Author SHA1 Message Date
Andreas Streichardt 9ad98ad8d3 ahhh jslint 2017-04-27 17:16:52 +02:00
Andreas Streichardt bb3df8cc84 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-27 17:00:37 +02:00
Andreas Streichardt ed98832f65 Add test to check waitForSyncReplication 2017-04-27 17:00:21 +02:00
Wilfried Goesgens 4c82acd5e7 only print real errors to the fail file 2017-04-27 16:29:39 +02:00
Andreas Streichardt 3dcef2efbb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-27 16:00:16 +02:00
Andreas Streichardt c47505d514 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-27 15:59:11 +02:00
jsteemann 2077b8033e fix invalid testing.js behavior 2017-04-27 15:53:57 +02:00
Jan Christoph Uhde 5fa2cffc63 fix warning 2017-04-27 15:51:19 +02:00
Jan Christoph Uhde 837763097a fix windows warning 2017-04-27 15:12:30 +02:00
Andreas Streichardt 2f6c391d9b move useless string to where it belongs 2017-04-27 15:04:08 +02:00
jsteemann 3b48b6bd51 update safeResumeTick as well 2017-04-27 14:47:22 +02:00
jsteemann 38fd964f99 fix empty server responses in case invalid users are used
fix compile error
2017-04-27 14:47:20 +02:00
jsteemann aa521d5412 better error messages 2017-04-27 14:47:19 +02:00
jsteemann 66ec078bd5 turn off deadlock detector in obvious cases in which it is not necessary 2017-04-27 14:47:19 +02:00
Jan Christoph Uhde 22028f14b7 add rest of applier api 2017-04-27 14:31:51 +02:00
Jan Christoph Uhde ac388a087e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  fixed shard ordering in Job::clones with consequences for unit tests
  improved debug facilities
  added isLocked() flag for ConditionLocker
  clarify index names
  Redesigned Collection.drop() in RocksDB. Does not write LogData and has a different workflow to create a consistent user-view
  fixed compile with USE_JEMALLOC=OFF
  cppcheck
  updated release notes
  Split tests to fix mac
  typo
  distributeShardsLike is not ignored when prototype does not exist
  fix wrong info. thanks @Simran-B
  fixed issue #2459
  fixed memleak
  Fixed startup exception
  Fixed typedefs
  RocksDB WAL entries for transactions
  Working initial sync
  Fixing incremental sync deletion
2017-04-27 13:46:07 +02:00
Jan Christoph Uhde 9418144210 add applier-state 2017-04-27 13:43:57 +02:00
Kaveh Vahedipour e40ebcfade Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 13:37:59 +02:00
Kaveh Vahedipour e7797d292e fixed shard ordering in Job::clones with consequences for unit tests 2017-04-27 13:37:47 +02:00
jsteemann fc43ecb44e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 13:13:44 +02:00
jsteemann 2b5cf28d74 improved debug facilities 2017-04-27 13:13:35 +02:00
Michael Hackstein 561bdf0b49 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-27 13:11:07 +02:00
jsteemann 8b7fe79ebb added isLocked() flag for ConditionLocker 2017-04-27 13:01:30 +02:00
jsteemann c99d64b5cc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 13:01:22 +02:00
jsteemann 5b3485f456 clarify index names 2017-04-27 13:01:12 +02:00
Michael Hackstein e0d9fd3cc3 Redesigned Collection.drop() in RocksDB. Does not write LogData and has a different workflow to create a consistent user-view 2017-04-27 12:58:51 +02:00
Frank Celler 0367a5b6fb Merge pull request #2460 from arangodb/feature/jemalloc-integration
fixed compile with USE_JEMALLOC=OFF
2017-04-27 12:54:14 +02:00
Frank Celler d90f0136bc fixed compile with USE_JEMALLOC=OFF 2017-04-27 12:43:48 +02:00
jsteemann f94ef035cb cppcheck 2017-04-27 12:26:13 +02:00
jsteemann cd377b0e0b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 11:31:15 +02:00
jsteemann e2690141c7 updated release notes 2017-04-27 11:31:08 +02:00
mpv1989 af393605db Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 11:02:48 +02:00
mpv1989 75afe8e6ad Split tests to fix mac 2017-04-27 11:02:41 +02:00
Kaveh Vahedipour 1109c7b54e typo 2017-04-27 10:43:02 +02:00
Kaveh Vahedipour 641700399b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 10:38:43 +02:00
Kaveh Vahedipour e778604cef distributeShardsLike is not ignored when prototype does not exist 2017-04-27 10:38:07 +02:00
Simon Grätzer 33ed35fa1f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 10:13:17 +02:00
jsteemann a3f5b8f082 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 09:27:15 +02:00
jsteemann 12ca8a28d4 fix wrong info. thanks @Simran-B 2017-04-27 09:26:53 +02:00
jsteemann 0de4be0c1d fixed issue #2459 2017-04-27 09:16:37 +02:00
jsteemann 74ccfb2fb3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 08:54:25 +02:00
jsteemann 81c629a685 fixed memleak 2017-04-27 08:54:19 +02:00
Jan Christoph Uhde 278fad9185 fix jslint errors 2017-04-27 08:37:49 +02:00
Jan Christoph Uhde 3261c4ca89 print executed dump/restore command in extremeVerbosity mode 2017-04-27 07:59:38 +02:00
Dan Larkin 6296f88c05 Added stub handler for PutLogData. 2017-04-26 22:49:32 -04:00
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 da03ae693e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 15:23:29 -04:00
Dan Larkin f8efe6e627 Added create index and change collection marker creation. 2017-04-26 15:23:25 -04:00