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
Max Neunhoeffer
3afd200599
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2017-04-26 09:44:42 +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
e6aa022962
Fixed dump tests in cluster. MMFiles is working RocksDB gets into undefined state somewhere.
2017-04-26 09:36:01 +02:00
Wilfried Goesgens
336a0ad20e
another try to get the LICENSE into place
2017-04-26 09:27:31 +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
Max Neunhoeffer
925051afe4
Rename an argument and add a comment.
2017-04-26 08:25:42 +02:00
Jan Christoph Uhde
7b2acaebfb
use stringref instead of allocation
2017-04-26 07:33:14 +02:00
Dan Larkin
114c9832f6
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-25 16:51:42 -04: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
Wilfried Goesgens
05a46e4781
fix db._explain() to work with the new interface of the graph traverser
2017-04-25 20:33:17 +02:00
Wilfried Goesgens
47be062957
move configuring of cmake back into install process - it will conflict with the release process otherwise
2017-04-25 20:33:02 +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
hkernbach
cd819e0b26
node info view
2017-04-25 19:27:30 +02:00
Kaveh Vahedipour
aefe90f89b
distributeShardsLike port from 3.1 app.js
2017-04-25 16:56:51 +02:00
Simon Grätzer
6d358c9b6a
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 16:55:44 +02:00
Kaveh Vahedipour
6e7843897b
distributeShardsLike port from 3.1 app.js
2017-04-25 16:55:40 +02:00
jsteemann
95f9439174
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 16:09:08 +02:00
jsteemann
4289105eb3
fix shutdown issue
2017-04-25 16:09:01 +02:00
Simon Grätzer
7c1d19930e
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 16:03:57 +02:00
Simon Grätzer
3aada2afe0
Fixed double handled case
2017-04-25 16:03:51 +02:00
Michael Hackstein
1dda903834
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-25 15:56:48 +02:00
Michael Hackstein
f21fd3c0fe
Made dropping of graphs more resilient to errors
2017-04-25 15:56:39 +02:00
jsteemann
7344a03623
fix crashes
2017-04-25 15:47:11 +02:00
Wilfried Goesgens
b0b919d9cc
portabilize the output of the debugger hint command
2017-04-25 15:31:10 +02:00
Manuel B
f524c55aa9
ldap test: missing ;
2017-04-25 15:22:52 +02:00
Manuel B
e518d15978
ldap test: tripple req
2017-04-25 15:21:02 +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
jsteemann
9ab0ee817a
jslint
2017-04-25 15:17:33 +02:00
Jan Christoph Uhde
e4b3f5c4ac
fix warning
2017-04-25 15:12:22 +02:00
Jan Christoph Uhde
3461de867b
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
* 'devel' of https://github.com/arangodb/arangodb :
Fixed drop in general-graph it now honors distributeShardsLike
HTTP collection API now finally exposes distributeShardsLike
2017-04-25 15:10:37 +02:00
Michael Hackstein
b9edda2d01
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-25 15:08:52 +02:00
Michael Hackstein
e5f7303dad
Fixed drop in general-graph it now honors distributeShardsLike
2017-04-25 15:08:45 +02:00
Jan Christoph Uhde
506a02efec
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
* 'devel' of https://github.com/arangodb/arangodb :
fixed warning
2017-04-25 15:08:37 +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
Michael Hackstein
d49e22f691
HTTP collection API now finally exposes distributeShardsLike
2017-04-25 15:08:14 +02:00
Simon Grätzer
a143cd1254
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
# Conflicts:
# arangod/Replication/InitialSyncer.cpp
2017-04-25 15:06:16 +02:00
Simon Grätzer
da5102ce6a
fixed warning
2017-04-25 15:05:18 +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
Wilfried Goesgens
3b17d9cdbc
add missing signaling of crashed state
2017-04-25 14:50:58 +02:00
Max Neunhoeffer
e7dba402e5
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2017-04-25 14:49:38 +02:00