1
0
Fork 0
Commit Graph

36467 Commits

Author SHA1 Message Date
jsteemann 2202f7b296 updated CHANGELOG 2017-02-08 01:09:26 +01:00
jsteemann 0040bc91e1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-08 01:07:00 +01:00
jsteemann 349de845d2 attempt to fix reported V8 version number 2017-02-08 01:06:15 +01:00
jsteemann 01d3ad67b1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-08 00:59:16 +01:00
jsteemann b76eeee92e reuse more AqlItemBlocks 2017-02-08 00:59:06 +01:00
jsteemann b6df44a348 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-08 00:03:36 +01:00
Max Neunhoeffer cbcda7932c Change undocumented behaviour in case of invalid rev in If-Match headers.
An invalid rev should lead to a 412 PRECONDITION FAILED rather than a
404 BAD error. This is more intuitive, in particular since we have
never documented what valid rev strings are. Also adjust tests and
CHANGELOG.
2017-02-07 22:37:38 +01:00
Max Neunhoeffer db9c244266 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-02-07 21:23:15 +01:00
jsteemann 59b3967273 Merge branch 'reuse-itemblocks' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 20:25:48 +01:00
jsteemann 35ddb01ed2 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 20:23:24 +01:00
Wilfried Goesgens 9386a1b2d5 symlinks for windows! 2017-02-07 17:43:30 +01:00
jsteemann 1555b0a453 move engine-specific things out of public API 2017-02-07 17:36:53 +01:00
jsteemann 9e48b072ae Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 17:32:14 +01:00
jsteemann 9d0a210545 prevent memleaks in C++ UnitTests 2017-02-07 17:30:30 +01:00
Wilfried Goesgens 1025b29b1a fix windows compile 2017-02-07 17:14:05 +01:00
jsteemann 5bc2a3680c move some MMFiles-specific things into MMFiles directory 2017-02-07 16:38:04 +01:00
jsteemann 34ebd5a63f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 16:37:41 +01:00
Wilfried Goesgens 65a7c7d946 follow external repo 2017-02-07 16:06:18 +01:00
Max Neunhoeffer 0a9c235530 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-02-07 15:32:30 +01:00
Max Neunhoeffer 883c11ea45 Handle the case that ClusterComm is already shut down gracefully.
This touches every single place where ClusterComm is being used.
2017-02-07 15:31:40 +01:00
jsteemann b9f19bf64f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 15:21:18 +01:00
Andreas Streichardt 8349f56e40 Properly check return valiue 2017-02-07 15:15:56 +01:00
jsteemann 073b53b20f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 14:50:46 +01:00
Wilfried Goesgens 8089e62c2d Merge branch 'devel' of github.com:arangodb/ArangoDB into v8_subsubmodule 2017-02-07 14:49:49 +01:00
Wilfried Goesgens 70da5cf376 mention git submodules 2017-02-07 14:48:47 +01:00
jsteemann 072183a964 make ctor explicit 2017-02-07 14:48:08 +01:00
Michael Hackstein f206eba45b Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-07 14:40:45 +01:00
jsteemann 79bd3ec2fa Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 14:37:24 +01:00
jsteemann d79d972b44 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 14:36:09 +01:00
jsteemann 2c9e220f03 refactoring 2017-02-07 14:36:03 +01:00
Frank Celler b3b02b10d3 fixed nested JobGuards 2017-02-07 14:35:24 +01:00
Wilfried Goesgens 5590cee2d0 fix branch 2017-02-07 14:18:39 +01:00
Wilfried Goesgens ffba5da5fd move forward 2017-02-07 14:17:14 +01:00
Kaveh Vahedipour a1650d6b76 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-07 14:16:33 +01:00
Kaveh Vahedipour b931aa967a new compaction thread for agency 2017-02-07 14:16:22 +01:00
Wilfried Goesgens 30757e856f move to anon git for submodules 2017-02-07 14:16:03 +01:00
Wilfried Goesgens 0932d51904 Merge branch 'devel' of github.com:arangodb/ArangoDB into v8_subsubmodule 2017-02-07 13:48:57 +01:00
Wilfried Goesgens c0af0bac81 fix windows compile for next V8 2017-02-07 13:48:34 +01:00
Michael Hackstein ebddba07ec Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-07 13:47:07 +01:00
Frank Celler 00720cdd29 ignore the result of processAll, try to read more async 2017-02-07 13:33:03 +01:00
Wilfried Goesgens 59ab494489 fix missing return codes as pointed out by ewout 2017-02-07 13:29:43 +01:00
jsteemann f213d67de0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 13:04:40 +01:00
jsteemann d468fffdcb fix problems with rollback 2017-02-07 13:04:27 +01:00
jsteemann d503a4d354 added reactor type 2017-02-07 12:41:41 +01:00
jsteemann 600af50bb1 added convenience method collectionName 2017-02-07 12:05:36 +01:00
Kaveh Vahedipour 6aaf1e0c6f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-07 11:59:51 +01:00
jsteemann a9057b2d12 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 11:58:56 +01:00
jsteemann 4fccb56f93 make TransactionState a class and privatize some of its internals 2017-02-07 11:58:34 +01:00
Wilfried Goesgens 76956d755f fix debug file renaming sheme 2017-02-07 11:51:34 +01:00
jsteemann 4a7c3734e0 remove friend class declaration 2017-02-07 11:45:50 +01:00