Max Neunhoeffer
8353b6b42d
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2016-09-09 14:31:13 +02:00
Max Neunhoeffer
8fef636106
Allow for detailed version query in arangosh.
2016-09-09 14:30:57 +02:00
Jan Christoph Uhde
0d2a1e6298
Merge branch 'devel' of github.com:arangodb/arangodb into devel
...
* 'devel' of github.com:arangodb/arangodb:
assert
don't crash when lock request fails
fixed recovery of "older" collections
changelog
fixed issue #2005
improved gv
2016-09-09 14:11:37 +02:00
Jan Christoph Uhde
b06666c5e5
fix compiler warning
2016-09-09 14:11:20 +02:00
jsteemann
1fcc5b18f7
assert
2016-09-09 13:57:34 +02:00
Jan Steemann
884b6d5d58
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-09-09 13:47:41 +02:00
Jan Steemann
6ebfdf5e1e
don't crash when lock request fails
2016-09-09 13:47:21 +02:00
Jan Steemann
1095843596
fixed recovery of "older" collections
2016-09-09 13:46:39 +02:00
hkernbach
a3ffd9e59d
changelog
2016-09-09 13:41:29 +02:00
hkernbach
ee65a1a375
fixed issue #2005
2016-09-09 13:39:15 +02:00
hkernbach
c8923c1021
improved gv
2016-09-09 13:16:57 +02:00
Jan Christoph Uhde
035d736fc0
Revert "fix bug with missing agents"
...
This reverts commit e230e3e2c5
.
2016-09-09 12:59:25 +02:00
Jan Christoph Uhde
6594a1cd58
add fix for windows
2016-09-09 11:49:12 +02:00
Jan Christoph Uhde
6fa320299e
fix authentication
2016-09-09 11:43:07 +02:00
Jan Christoph Uhde
e230e3e2c5
fix bug with missing agents
2016-09-09 11:21:05 +02:00
Jan Christoph Uhde
6b7e3f48b7
Merge branch 'devel' of github.com:arangodb/arangodb into obi-velocystream
...
* 'devel' of github.com:arangodb/arangodb:
make version details queryable via db._version()
2016-09-09 11:09:28 +02:00
Jan Christoph Uhde
79fc0094e9
add authorization/authentication for vpp
2016-09-09 11:08:50 +02:00
jsteemann
e08a2d0258
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-09-09 10:50:45 +02:00
jsteemann
c4ca7ae2b5
make version details queryable via db._version()
2016-09-09 10:50:21 +02:00
Jan Christoph Uhde
6d19d3a7d4
Merge remote-tracking branch 'origin/devel' into obi-velocystream
...
* origin/devel:
formatting
fix clang compile warning
updated cmake and boost
fixed typo
2016-09-09 09:44:40 +02:00
Jan Christoph Uhde
26f1ec7db1
shorten processRead()
2016-09-09 09:41:59 +02:00
jsteemann
331c4e34ae
formatting
2016-09-09 09:29:35 +02:00
jsteemann
01e445a626
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-09-09 09:19:18 +02:00
jsteemann
6ffba6a64b
fix clang compile warning
2016-09-09 09:18:57 +02:00
Frank Celler
66c921895b
updated cmake and boost
2016-09-09 08:56:47 +02:00
Jan Christoph Uhde
f4994993da
fix return value with optional
2016-09-09 00:06:34 +02:00
Jan Christoph Uhde
a095c93e7a
Merge branch 'devel' of github.com:arangodb/arangodb into obi-velocystream
...
* 'devel' of github.com:arangodb/arangodb:
testing constutuent shutdown correctness
optimising agency handover
jslint
Fixed compile warning
Fixed traverser test. Which has two possible results
Reverted usage of VPP in cluster internal replication.
DBServer collections now use a cluster-wide unique id for their cids. Better handling of waiting for replication.
minor
running agent?
Specify how uniq autogenerated _key's can be.
2016-09-08 23:00:49 +02:00
Jan Christoph Uhde
fb776a0e95
begin refactoring of processRead
2016-09-08 22:59:23 +02:00
jsteemann
ac92bae528
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-09-08 17:52:51 +02:00
jsteemann
a9902fe02d
fixed typo
2016-09-08 17:52:29 +02:00
Kaveh Vahedipour
64da7d0fc7
testing constutuent shutdown correctness
2016-09-08 17:47:52 +02:00
Kaveh Vahedipour
3135fcb5dd
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-09-08 17:40:40 +02:00
Kaveh Vahedipour
33c2692c50
optimising agency handover
2016-09-08 17:39:50 +02:00
jsteemann
50ff529244
jslint
2016-09-08 17:34:59 +02:00
Michael Hackstein
d7b4ad5797
Fixed compile warning
2016-09-08 17:15:35 +02:00
Michael Hackstein
adec2b1c50
Fixed traverser test. Which has two possible results
2016-09-08 17:07:12 +02:00
Michael Hackstein
93bf48cc6e
Reverted usage of VPP in cluster internal replication.
2016-09-08 16:55:15 +02:00
Michael Hackstein
adf2601e73
Merge branch 'devel' of github.com:arangodb/arangodb into generic-col-types
2016-09-08 16:26:57 +02:00
Michael Hackstein
b8d43870d8
Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types
2016-09-08 16:26:25 +02:00
Michael Hackstein
a3ba4b249d
DBServer collections now use a cluster-wide unique id for their cids. Better handling of waiting for replication.
2016-09-08 16:26:17 +02:00
Jan Christoph Uhde
fc57c4809b
Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream
...
* 'generic-col-types' of github.com:arangodb/arangodb: (168 commits)
fix memleak
Fixed shutdown of Traversal Blocks in Cluster
restructuring agent wakeup
remove visibility
Traverser engine now unlocks all it's shards
handle 0 values
added HTTP REST APIs for online loglevel adjustments:
move json-utilities to the place where it is solely used
too verbose messages from cluster.js
unify exception debugging
Improved shutdown process of Graph Traverser Engines. This state causes a double free. Merge commit.
silenced cppcheck warning
silenced cppcheck warning
silenced warning in maintainer-mode
allow inline suppression
give more debug info
cosmetics
properly free EngineInfo
fix memleak
fix some leaks
...
2016-09-08 16:00:43 +02:00
Jan Christoph Uhde
b560d15b72
prepare to send multiple chunks and do compression
2016-09-08 15:59:33 +02:00
Kaveh Vahedipour
df4dabc019
minor
2016-09-08 15:27:27 +02:00
Kaveh Vahedipour
adcab701b3
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-09-08 14:08:30 +02:00
Kaveh Vahedipour
998a635fd6
running agent?
2016-09-08 14:08:20 +02:00
jsteemann
0ed43127d5
fix memleak
2016-09-08 14:02:07 +02:00
jsteemann
cb3d2eb6b9
Merge branch 'obi-velocystream' of https://github.com/arangodb/arangodb into generic-col-types
2016-09-08 13:58:36 +02:00
Wilfried Goesgens
c4c91a8189
Specify how uniq autogenerated _key's can be.
2016-09-08 13:48:23 +02:00
Michael Hackstein
25aa6d0b23
Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types
2016-09-08 13:37:38 +02:00
Michael Hackstein
1625260f4e
Fixed shutdown of Traversal Blocks in Cluster
2016-09-08 13:37:29 +02:00