Michael Hackstein
f876eef088
Removed unused member variable in ShortestPathBlock
2017-04-26 09:52:00 +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
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
Jan Christoph Uhde
7b2acaebfb
use stringref instead of allocation
2017-04-26 07:33:14 +02:00
Dan Larkin
20dc8b4fa0
Fixed duplicate objectIds in InitialSyncer.
2017-04-25 16:51:38 -04: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
jsteemann
4289105eb3
fix shutdown issue
2017-04-25 16:09:01 +02:00
jsteemann
7344a03623
fix crashes
2017-04-25 15:47:11 +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
Jan Christoph Uhde
e4b3f5c4ac
fix warning
2017-04-25 15:12:22 +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
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
jsteemann
f4972d38ab
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 14:41:13 +02:00
jsteemann
09e3a19a5b
try to fix shutdown issue
2017-04-25 14:41:04 +02:00
Simon Grätzer
284d620c0b
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 14:27:39 +02:00
Simon Grätzer
69c2faf592
Fixed synced
2017-04-25 14:27:34 +02:00
jsteemann
6935b6fe3e
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 14:20:20 +02:00
jsteemann
bd5737c5e7
try to fix shutdown issues when collection opening thread is waiting forever for scheduler to finish
2017-04-25 14:20:00 +02:00
Kaveh Vahedipour
d88f990ad0
dropping sharding prototype collection more verbose
2017-04-25 14:17:08 +02:00
Kaveh Vahedipour
999334e366
dropping sharding prototype collection more verbose
2017-04-25 14:13:07 +02:00
Kaveh Vahedipour
bf67189d98
dropping sharding prototype collection more verbose
2017-04-25 14:11:44 +02:00
Kaveh Vahedipour
1361e5e6dd
dropping sharding prototype collection more verbose
2017-04-25 14:03:26 +02:00
Kaveh Vahedipour
21c1a68702
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 14:00:05 +02:00
Kaveh Vahedipour
f0f40b6e8d
dropping sharding prototype collection more verbose
2017-04-25 13:59:56 +02:00
Simon Grätzer
3c6074a206
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 13:33:36 +02:00
jsteemann
861291da16
honor exclusive locks
2017-04-25 12:56:56 +02:00
jsteemann
9db917bd77
try to fix shutdown issue
2017-04-25 12:28:51 +02:00
Simon Grätzer
8aaac6d5a2
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 12:02:04 +02:00
Simon Grätzer
5d20b79c0f
Incremental Sync
2017-04-25 12:01:58 +02:00
Kaveh Vahedipour
bc8f08189b
searching for the shutdown problem on mac
2017-04-25 11:53:55 +02:00
Jan Christoph Uhde
319a47c64b
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
* 'devel' of https://github.com/arangodb/arangodb :
try to fix startup order
2017-04-25 11:14:45 +02:00
jsteemann
3cdeeffc13
try to fix startup order
2017-04-25 11:14:10 +02:00
Jan Christoph Uhde
17db954a86
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
* 'devel' of https://github.com/arangodb/arangodb :
Removed if where if and else were identical
changelog
fixed issue: 2448
all agency threads shutdown in their destructors if not stopping yet
ui: fixed login windows showing wrong available dbs
fix bug with ioService gone before hearbeatthread
2017-04-25 11:12:49 +02:00
Jan Christoph Uhde
e5447d2e8c
prevent crashing of replication when not using mmfiles engine
2017-04-25 11:11:58 +02:00
Michael Hackstein
9e49f87fe6
Removed if where if and else were identical
2017-04-25 10:10:46 +02:00
Kaveh Vahedipour
7766c44aaa
all agency threads shutdown in their destructors if not stopping yet
2017-04-25 09:34:08 +02:00
Kaveh Vahedipour
2e3bd066f3
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 08:54:45 +02:00
Kaveh Vahedipour
6ef775e52f
fix bug with ioService gone before hearbeatthread
2017-04-25 08:54:33 +02:00
Jan Christoph Uhde
5f31e2b692
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
* 'devel' of https://github.com/arangodb/arangodb :
Removed non-applicable test case.
unused variable
rocksdb options
fixes for non-array IN lookups, added tests
Add check for distributeShardsLike to dropCollectionCoordinator.
fixed foxx test
added missing return
js request simplified if sslProtocol
pass also sslProtocol from request to internal.download
fixed issue #2450
cppcheck
Added a missing switch break.
remove dead code
updated CHANGELOG
raised to 4
added 'x-content-type-options: nosniff' to avoid MSIE bug
fixed queue size
added queue size to statistics
added queue time and request tracing with timings
2017-04-25 08:38:51 +02:00
jsteemann
a52a6ff21e
unused variable
2017-04-25 02:26:02 +02:00
jsteemann
0434d88ab4
rocksdb options
2017-04-25 02:22:00 +02:00
jsteemann
4300c77d3e
fixes for non-array IN lookups, added tests
2017-04-25 01:47:07 +02:00
jsteemann
ca5d54aa58
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-25 00:03:05 +02:00
Max Neunhoeffer
e16f9ca7c5
Add check for distributeShardsLike to dropCollectionCoordinator.
2017-04-24 23:54:07 +02:00
jsteemann
fe1268af97
added missing return
2017-04-24 23:30:57 +02:00