hkernbach
d160791569
fixed event ui bug
2017-04-11 10:58:59 +02:00
Simon Grätzer
fac53e5a06
Fixing edge iterator
2017-04-11 10:01:56 +02:00
Simon Grätzer
901ffd5e2f
Fixed rocksdb options
2017-04-11 09:31:39 +02:00
Simran Brucherseifer
653e4349d9
Docs: Remove Piwik
2017-04-11 09:12:47 +02:00
Dan Larkin
b030cdb347
Fixed an edge index iterator bug.
2017-04-10 20:12:15 -04:00
Jan Christoph Uhde
8df9fe1d21
fix error in insert
2017-04-10 21:27:52 +02:00
baslr
42c6e539da
initial ldap test
2017-04-10 17:45:46 +02:00
baslr
d4ae94f937
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-10 17:14:37 +02:00
Andreas Streichardt
bf2efb387e
Fix unlocking of AQL queries in the cluster
2017-04-10 17:01:24 +02:00
Jan Christoph Uhde
8257168519
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
...
* 'engine-api' of https://github.com/arangodb/arangodb :
Removed V8Traverser files and made ShortestPathOptions an extension of Graph::BaseOptions. Now they are ready to use LokkupInfos as well. Now starting to move logic around
Factorized BaseOptions out of TraverserOptions. Those should be used in common for ShortestPath and Traversals. Right now only traverser use it.
2017-04-10 16:34:11 +02:00
Jan Christoph Uhde
60c4f27ec6
finish transaction limiting for truncate
2017-04-10 16:33:36 +02:00
Michael Hackstein
cf7136264b
Removed V8Traverser files and made ShortestPathOptions an extension of Graph::BaseOptions. Now they are ready to use LokkupInfos as well. Now starting to move logic around
2017-04-10 16:26:23 +02:00
jsteemann
2269ef913c
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-04-10 15:21:27 +02:00
jsteemann
34fa3e60ad
don't fail when non-array, but simply ignore it
2017-04-10 15:20:16 +02:00
baslr
f4039fa97d
Merge remote-tracking branch 'origin/devel' into devel
2017-04-10 15:10:36 +02:00
baslr
21d3056925
fixed another redirection issue
2017-04-10 15:10:16 +02:00
Michael Hackstein
d9dbf2111a
Factorized BaseOptions out of TraverserOptions. Those should be used in common for ShortestPath and Traversals. Right now only traverser use it.
2017-04-10 14:09:55 +02:00
Wilfried Goesgens
6bcffbb8ee
cleanup strip data along with the package data
2017-04-10 14:02:17 +02:00
Jan Christoph Uhde
bb25adf0e6
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
...
* 'engine-api' of https://github.com/arangodb/arangodb :
Removed unreachable code
Removed superflous aql::ShortestPathOptions and replaced it by traverser::ShortestPathOptions. Api is not fixed yet.
2017-04-10 14:01:32 +02:00
Jan Christoph Uhde
c82fadc863
prepare limitation of transaction size
2017-04-10 14:00:55 +02:00
Wilfried Goesgens
dd2b2b3cce
add more state logging to the supervisor
2017-04-10 11:22:07 +02:00
Michael Hackstein
b3ae8e8676
Removed unreachable code
2017-04-10 11:19:17 +02:00
Michael Hackstein
30d68ba962
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-04-10 11:02:14 +02:00
Michael Hackstein
052c4942fc
Removed superflous aql::ShortestPathOptions and replaced it by traverser::ShortestPathOptions. Api is not fixed yet.
2017-04-10 11:02:01 +02:00
Wilfried Goesgens
7ab64a3d96
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-10 09:40:38 +02:00
Jan Christoph Uhde
efb6d498f0
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
...
* 'engine-api' of https://github.com/arangodb/arangodb :
Fixed issue with cache transactions.
Fixing more recovery tests
2017-04-10 09:28:54 +02:00
Jan Christoph Uhde
b4b2ac0dbd
work on counting bug
2017-04-10 09:23:35 +02:00
Frank Celler
50cfd9883e
added missing nullptr check
2017-04-10 09:23:30 +02:00
jsteemann
0229ab9326
issue #2415
2017-04-09 23:19:10 +02:00
Simon Grätzer
e2813114ea
Merge conflict
2017-04-08 10:59:04 +02:00
Dan Larkin
842a665ec5
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-04-07 17:02:34 -04:00
Dan Larkin
eaac6c013c
Fixed issue with cache transactions.
2017-04-07 16:58:22 -04:00
baslr
ebd0d012b4
fixed redirection issue
2017-04-07 18:20:46 +02:00
Jan Christoph Uhde
9a079381b3
fix warning and make use of error code
2017-04-07 17:58:33 +02:00
baslr
80ac3b42e7
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-07 17:29:55 +02:00
baslr
7c96e02e90
fixed issue #1974
2017-04-07 17:29:34 +02:00
Jan Christoph Uhde
56987e1ddd
fix recovery tests
2017-04-07 16:52:51 +02:00
Wilfried Goesgens
ab882744d9
on windows put the catch test next to the binaries so we can find the proper dll easily
2017-04-07 16:44:45 +02:00
Wilfried Goesgens
cfa5daec8f
port setenv call for windows
2017-04-07 16:43:26 +02:00
Wilfried Goesgens
331ff7b724
once we found icudtl.dat save its location to the env, so subsequent processes can use that.
2017-04-07 16:06:07 +02:00
Max Neunhoeffer
53b3a73486
Add a timeout option to <collection>.drop().
...
This is in particular used to allow the Schmutz to make progress
in the case of a long running transaction.
2017-04-07 15:52:19 +02:00
Jan Christoph Uhde
4fe6906463
fix recovery tests
2017-04-07 15:38:23 +02:00
jsteemann
5f72d80cc2
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-07 14:56:41 +02:00
jsteemann
ba16c360c2
use exclusive locks
2017-04-07 14:56:28 +02:00
jsteemann
cb031de4fe
disable cache in primary index
2017-04-07 14:56:11 +02:00
jsteemann
4cf5fedca9
honor subcodes in rocksdb statuses
2017-04-07 14:55:55 +02:00
Wilfried Goesgens
6ab23bd56d
better detect cygwin i/o
2017-04-07 14:00:35 +02:00
jsteemann
08cd4ced33
moved class around
2017-04-07 13:13:48 +02:00
Simon Grätzer
ab62d8e99f
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-04-07 12:31:17 +02:00
Simon Grätzer
3a0f31dcf6
Fixing more recovery tests
2017-04-07 12:31:00 +02:00