Michael Hackstein
6ad225370a
Removed usage of FULLTEXT in tests. Is replaced by simplequery fulltext()
2017-02-08 13:43:03 +01:00
Wilfried Goesgens
59f0f8bca5
Merge branch 'devel' of github.com:arangodb/ArangoDB into devel
2017-02-08 13:27:42 +01:00
Wilfried Goesgens
9c377f194b
SILENCE! I KILL YOU!
2017-02-08 13:27:34 +01:00
Jan Christoph Uhde
9d7462b8ec
disable temporarily assert in clustercom until AQLFeature is ready @max
2017-02-08 13:25:34 +01:00
Michael Hackstein
7cec7a4628
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-02-08 12:54:26 +01:00
Michael Hackstein
d47298d518
Removed JS_NEAR, JS_FULLTEXT, JS_WITHIN entirely. They have been replaced by simple queries
2017-02-08 12:54:10 +01:00
Frank Celler
cab6ac044d
fixed compile warning
2017-02-08 12:05:32 +01:00
Max Neunhoeffer
c62428145b
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2017-02-08 11:07:33 +01:00
Max Neunhoeffer
bc9cb47b5d
Add assertion for nullptr in ClusterComm::instance()
2017-02-08 11:07:12 +01:00
Wilfried Goesgens
3875c129d1
Merge branch 'devel' of github.com:arangodb/ArangoDB into devel
2017-02-08 11:01:12 +01:00
Wilfried Goesgens
9dffdbe3f2
add another directory to detect arangosh
2017-02-08 11:00:50 +01:00
Max Neunhoeffer
0a31063a35
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2017-02-08 11:00:36 +01:00
Max Neunhoeffer
bde48d524d
Change undocumented behaviour in case of invalid rev in JS document ops.
...
An invalid rev should lead to a 1200 ("conflict") error rather than a
1239 ("illegal document revision") error. This is more intuitive and
in line with the corresponding change in the HTTP API. No tests needed
adjustment.
2017-02-08 10:59:04 +01:00
Andreas Streichardt
ad1c7e7c13
oh jslint
2017-02-08 10:49:36 +01:00
Andreas Streichardt
2e3026db91
Make it possible to remove failed coordinators
2017-02-08 10:26:13 +01:00
Frank Celler
0da95481ea
added locks for keep-alive
2017-02-08 09:41:18 +01:00
jsteemann
e75fe96546
try to fix compile warning
2017-02-08 09:33:01 +01:00
jsteemann
29d7db65c1
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-08 01:09:58 +01:00
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