Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
31,718 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

11841 Commits

Author SHA1 Message Date
hkernbach f014cf964b fixed modal display bug [ci skip] 2016-06-14 17:22:01 +02:00
Alan Plum a8219b4818
Unbreak the build I say 2016-06-14 17:20:06 +02:00
Alan Plum 0f5b4624ea
Unbreak the build 2016-06-14 17:18:40 +02:00
Wilfried Goesgens 98f3258eef fresh swagger. 2016-06-14 17:14:17 +02:00
Kaveh Vahedipour 66e6315113 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 17:14:00 +02:00
Kaveh Vahedipour 0f66a110de fixed max_elements bug in job transactions 2016-06-14 17:13:52 +02:00
Wilfried Goesgens b705f3613f fresh swagger. 2016-06-14 16:49:37 +02:00
Kaveh Vahedipour a3694e7a01 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 16:39:17 +02:00
Kaveh Vahedipour 1b77bc7a83 ageny tests 2016-06-14 16:39:07 +02:00
Alan Plum 0867e8aa87
Validate request headers also 2016-06-14 16:29:36 +02:00
Alan Plum 4466925398
Remove redundant quotes 
[skip ci]
 2016-06-14 16:29:33 +02:00
Alan Plum 45488ef615
Make param validation errors more descriptive 2016-06-14 16:29:31 +02:00
Alan Plum 8639ebb4cf
Rename 'reason' to 'description' 
[skip ci]
 2016-06-14 16:29:29 +02:00
hkernbach 30b4c8aca5 Merge branch 'uditha-atukorala-devel' into devel 2016-06-14 16:27:11 +02:00
Max Neunhoeffer 1be89d4667 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 16:20:38 +02:00
Max Neunhoeffer 5153b230b8 Wait for sync repl to settle after db create. 2016-06-14 16:20:18 +02:00
jsteemann 83466c2342 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 16:14:21 +02:00
jsteemann 4b8f2d4594 jslint 2016-06-14 16:14:15 +02:00
jsteemann 34877186dd make user-defined AQL functions throw again 2016-06-14 16:14:02 +02:00
hkernbach 498742ceb2 Merge branch 'devel' of https://github.com/uditha-atukorala/arangodb into uditha-atukorala-devel 2016-06-14 16:12:40 +02:00
Max Neunhoeffer 3e1b745f64 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 15:59:45 +02:00
Max Neunhoeffer 6ae19f3987 Move waiting code to @arangodb/cluster.js 2016-06-14 15:59:20 +02:00
Max Neunhoeffer 527b9159dd Minor corrections. 2016-06-14 15:58:53 +02:00
hkernbach f7687a3326 jslint + grunt build 2016-06-14 15:44:50 +02:00
Max Neunhoeffer 6dba665a34 At create database wait for synchronous replication to kick in. 2016-06-14 15:40:55 +02:00
hkernbach 8d8f935cd4 support view [ci skip] 2016-06-14 15:24:21 +02:00
hkernbach dbf3dafdde Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 15:09:32 +02:00
Kaveh Vahedipour ab593bfa94 error handling in rest handling and random generator in constituent 2016-06-14 14:51:48 +02:00
hkernbach 10dcc377ef Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 14:36:43 +02:00
hkernbach 0c9e0e7c66 ie + edge cache fixes 2016-06-14 14:36:32 +02:00
Max Neunhoeffer 85d64d0eae Do not retry for too long to synchronize a shard. 2016-06-14 13:54:53 +02:00
Andreas Streichardt 9247f759c2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 13:08:24 +02:00
Andreas Streichardt 85593ba179 useless jslint 2016-06-14 13:08:12 +02:00
Wilfried Goesgens 77fdf8c31c Fix copying of arangod for later crash analysis; don't default to /var/tmp/ so regular cleanup jobs can catch it. 2016-06-14 13:05:47 +02:00
Alan Plum 2c8732e674
Fix aardvark foxx icon size 2016-06-14 11:56:33 +02:00
Max Neunhoeffer 3348e8769d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 10:57:59 +02:00
Max Neunhoeffer b6ba8f841c Lower info level of some warning. 2016-06-14 10:51:15 +02:00
Max Neunhoeffer 9c74d6a076 Properly protect traffic in Sync Keyspace. 2016-06-14 10:49:28 +02:00
Andreas Streichardt b82290cc13 Centralize downloading 2016-06-14 10:11:37 +02:00
Max Neunhoeffer 7e84980153 Log level in tests. 2016-06-14 00:32:35 +02:00
Max Neunhoeffer 418111b942 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 00:13:23 +02:00
Max Neunhoeffer 9d42790580 Take out a debugging print. 2016-06-14 00:13:09 +02:00
hkernbach 5a351d8344 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 00:11:44 +02:00
hkernbach 7b9fd624e9 shard view [ci skip] 2016-06-14 00:11:34 +02:00
Max Neunhoeffer 982b4e1735 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-14 00:09:00 +02:00
Max Neunhoeffer 82ac357b2a Less debugging output. 2016-06-14 00:08:42 +02:00
Max Neunhoeffer 66ae93bf1f More patience to wait for supervision to finish jobs. 2016-06-14 00:08:24 +02:00
Max Neunhoeffer 5bbcc6cd02 Lower logging level in tests for replication topic. 2016-06-14 00:07:44 +02:00
hkernbach 6e8a5f78d5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-14 00:05:52 +02:00
hkernbach fc8c8dea52 grunt build [ci skip] 2016-06-14 00:05:44 +02:00
Max Neunhoeffer c0b48dcc4a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-13 23:55:21 +02:00
hkernbach ca897dce25 css for internet explorer :) [ci skip] 2016-06-13 23:42:38 +02:00
hkernbach 4d9c8356dd added global ajax cache flag to prevent IE end EDGE from caching everything [ci skip] 2016-06-13 23:29:55 +02:00
Max Neunhoeffer 79025546f7 Improve moveShard tests and testing infrastructure. 2016-06-13 23:28:32 +02:00
hkernbach 5dee5948b6 included version in foxx-zip download name 2016-06-13 21:07:04 +02:00
hkernbach 0073f621b1 grunt build [ci skip] 2016-06-13 20:47:51 +02:00
hkernbach 9335739c21 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-13 20:40:50 +02:00
hkernbach d844ff790f shard view 2016-06-13 20:40:14 +02:00
Uditha Atukorala 725bb69f75 drop duplicate cleanup functionality 2016-06-13 18:45:08 +01:00
Andreas Streichardt 104cd2fed5 Fix cluster statistics 2016-06-13 19:42:13 +02:00
Uditha Atukorala 3e78f1313e fix dygraph data cleanup logic 2016-06-13 18:42:01 +01:00
hkernbach a36f4705fb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-13 19:35:22 +02:00
Uditha Atukorala bd073a142f remove residentSize from dygraph configs since it is not used any more 2016-06-13 18:34:48 +01:00
Alan Plum 3ac6139fdc
Also format JSON body in res.write & res.body 2016-06-13 18:30:38 +02:00
hkernbach 48635954de shard view [ci skip] 2016-06-13 15:56:14 +02:00
hkernbach 99de04eee9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-13 15:49:46 +02:00
hkernbach 55f9647f47 shard view + menu 2016-06-13 15:49:35 +02:00
Kaveh Vahedipour d130743a73 shrinkCluster tests 2016-06-13 15:15:10 +02:00
Mark 328b7681f1 Test format fix 2016-06-13 14:44:33 +02:00
Mark 705edefe41 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-13 14:37:50 +02:00
Max Neunhoeffer c3d9336450 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-13 14:37:38 +02:00
Mark 822fb3282f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-13 14:37:16 +02:00
Max Neunhoeffer 0040105e80 Finish transformation to three digit numbers in server IDs. 2016-06-13 14:37:15 +02:00
Mark 23d1a204b6 breadth first tests added 2016-06-13 14:36:52 +02:00
Alan Plum 279ec5e973
Also handle defaultDocument in non-legacy services 2016-06-13 14:27:26 +02:00
Max Neunhoeffer 1f926fc24b Fix synchronous replication: use shard name instead of ID. 
Explanation: Different replicas of the same shard will have different
local collection IDs. Therefore we have to use the shard name
(collection name) to indentify collections in synchronous replication.
 2016-06-13 13:54:32 +02:00
Max Neunhoeffer b348514d36 Make /Target/CleanedServers writable. 2016-06-13 11:43:12 +02:00
Frank Celler 54d39573d3 generated 2016-06-12 21:41:45 +02:00
hkernbach 2947b87a95 grunt build [ci skip] 2016-06-12 15:17:58 +02:00
hkernbach 4d449fd7a7 shards view [ci skip] 2016-06-12 15:14:58 +02:00
hkernbach a8474192c7 shards view 2016-06-12 15:10:15 +02:00
hkernbach 49dded25f0 ui user collection bugfix [ci skip] 2016-06-12 14:09:44 +02:00
hkernbach afc72166c7 grunt build [ci skip] 2016-06-12 13:45:24 +02:00
hkernbach a54ad3cde8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-12 13:43:31 +02:00
hkernbach 80619ce7f8 support view [ci skip] 2016-06-12 13:18:52 +02:00
Frank Celler 096e7bfbf8 generated examples 2016-06-12 12:19:37 +02:00
Frank Celler ed01dcec8f secure-installation will remove all users except root 2016-06-12 12:19:37 +02:00
hkernbach 7b6ff093db login view bugfix [ci skip] 2016-06-12 12:11:44 +02:00
hkernbach 976160f0a6 web ui users bugfix 2016-06-12 12:09:56 +02:00
hkernbach fc56b3a845 frontend ui query bugfix 2016-06-12 12:02:44 +02:00
hkernbach 4c0682984d fixed save doc / edge issues 2016-06-12 11:38:32 +02:00
Michael Hackstein 614c52d5c6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-10 21:34:53 +02:00
Michael Hackstein d7a710593a Fixed some minor bugs in breadth-first-search for AQL traversal. Also added another test case for it. 2016-06-10 21:00:38 +02:00
Max Neunhoeffer f0cb8b936f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-10 17:07:06 +02:00
Frank Celler 5634325bda fixed auth for superuser 2016-06-10 16:49:18 +02:00
Frank Celler 59cae06890 fixed typo 2016-06-10 16:38:38 +02:00
Frank Celler 927c697b8b fixed auth (again) 2016-06-10 16:21:48 +02:00
Max Neunhoeffer 794a08dd86 Finish first version of rebalanceShards. 2016-06-10 15:56:25 +02:00
Max Neunhoeffer 2169778f06 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-10 15:49:05 +02:00
hkernbach 1542ee4c6d fixed custom queries download 2016-06-10 15:40:18 +02:00
hkernbach 434013767f renamed permission api to database in ui [ci skip] 2016-06-10 15:39:46 +02:00
hkernbach bb96351245 scss [ci skip] 2016-06-10 15:38:45 +02:00
Max Neunhoeffer ae4233bebd Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-10 14:42:05 +02:00
Max Neunhoeffer 3a8412090d rebalanceShards. 2016-06-10 14:41:46 +02:00
hkernbach 6a74033eb3 _frontend collection permission 2016-06-10 14:20:44 +02:00
Frank Celler fa9501cc0c use defer release 2016-06-10 14:01:42 +02:00
hkernbach 91cb15bb5d support view 2016-06-10 13:35:39 +02:00
hkernbach 754b1d4ec6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-10 13:17:53 +02:00
Max Neunhoeffer be756c215b Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-10 12:14:35 +02:00
Max Neunhoeffer f9fa8ee39f Please jslint. 2016-06-10 12:14:15 +02:00
Max Neunhoeffer f2dfbf7448 Change format of /_admin/cluster/shardDistribution. 2016-06-10 12:12:55 +02:00
Max Neunhoeffer 6b7b54cf03 Better handling of shutdown situation for shard sync. 2016-06-10 12:04:09 +02:00
Andreas Streichardt c32cf40865 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-10 12:02:26 +02:00
Andreas Streichardt cd9a8d6448 Fix download links 2016-06-10 12:02:06 +02:00
hkernbach 85db06a3b3 nodes view [ci skip] 2016-06-10 12:00:41 +02:00
Max Neunhoeffer 5a4750a89e New error TRI_ERROR_SHUTTING_DOWN. 2016-06-10 11:59:46 +02:00
hkernbach b1ab24e24c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-10 11:16:00 +02:00
hkernbach 14b4beb68e docuemtn view [ci skip] 2016-06-10 11:15:55 +02:00
Frank Celler fdf375a01e isStopping 2016-06-10 11:12:01 +02:00
hkernbach 955f701b49 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-10 11:04:17 +02:00
hkernbach 2842bfb977 modified database creation view 2016-06-10 11:03:55 +02:00
Max Neunhoeffer 206e502177 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-10 10:50:22 +02:00
Max Neunhoeffer 2c6e5d9812 Fix syncCollectionFinalize to adjust to new async repl. API data format. 2016-06-10 10:38:27 +02:00
Kaveh Vahedipour f674e8ecea more kv tests agency 2016-06-10 10:36:31 +02:00
hkernbach 1eaa11d8b0 ui flickering issue 2016-06-10 09:56:48 +02:00
hkernbach ec8da65d8a login view 2016-06-10 09:23:49 +02:00
hkernbach 8e66eb8f0c grunt build [ci skip] 2016-06-10 00:36:46 +02:00
hkernbach 4cdcc7d873 permission api 2016-06-10 00:36:22 +02:00
hkernbach 4783e6fdb0 jslint [ci skip] 2016-06-10 00:33:40 +02:00
hkernbach 37e6d1d0de Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-10 00:31:13 +02:00
hkernbach 355725ff61 user view, permission view, interval changes, bugfixes 2016-06-10 00:31:10 +02:00
Max Neunhoeffer 059b24d7e7 Start work on rebalancing of shards. 2016-06-10 00:13:42 +02:00
Max Neunhoeffer 78fb88a38b Add a coordinator route to show shardDistribution. 2016-06-09 23:24:39 +02:00
hkernbach 2a12164ad2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-09 20:37:07 +02:00
hkernbach bf88b486c1 nodes view calculation fix [ci skip] 2016-06-09 20:36:54 +02:00
Jan Steemann 0f25de4e4f fixed revocation of user privileges 2016-06-09 17:29:08 +02:00
hkernbach dd18610f71 nodes view 2016-06-09 16:46:41 +02:00
hkernbach e29cc181c2 grunt build [ci skip] 2016-06-09 16:39:50 +02:00
hkernbach 85a579044e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-09 16:37:23 +02:00
hkernbach 19f744ba62 cleanup, css, views, templates 2016-06-09 16:37:17 +02:00
Max Neunhoeffer 4b652162ef Activate agency tests in all test target. 2016-06-09 16:36:07 +02:00
jsteemann fd05d373dc re-add default parameters, but disable agency tests 2016-06-09 16:04:21 +02:00
jsteemann 523a50e32e disable agency testing 2016-06-09 16:01:31 +02:00
Jan Steemann af60ee372b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-09 15:47:59 +02:00
Jan Steemann 866a2527c4 updated documentation 2016-06-09 15:47:51 +02:00
Max Neunhoeffer b622ea68d9 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-09 15:30:16 +02:00
Max Neunhoeffer 5ab4f970a6 Improve a warning message. 2016-06-09 15:29:10 +02:00
Frank Celler d954d05074 added default agency size 3 2016-06-09 15:28:27 +02:00
Frank Celler f029808e4e added restore-admin 2016-06-09 15:28:27 +02:00
Max Neunhoeffer 887093bbb9 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-09 14:43:52 +02:00
Max Neunhoeffer e52832715a Repair test code. 2016-06-09 14:43:11 +02:00
Max Neunhoeffer d0f0918baf Translate collection name to ID in /_admin/cluster/moveShard. 2016-06-09 14:42:42 +02:00
Jan Steemann ce9a35ffe4 updated functions list in frontend 2016-06-09 14:18:38 +02:00
Max Neunhoeffer 174d620475 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-09 13:52:41 +02:00
Andreas Streichardt cddca977d4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-09 13:43:26 +02:00
Andreas Streichardt c63e0cb126 skip authentication tests on cluster...broken by design right now 2016-06-09 13:42:52 +02:00
Max Neunhoeffer e6bc1b967f More tests for moving shards. 2016-06-09 13:41:47 +02:00
Kaveh Vahedipour 9fd39ed804 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-09 13:36:57 +02:00
Kaveh Vahedipour a13de0044e waitForCommit is new default behaviour of writes in agency 2016-06-09 13:36:17 +02:00
Max Neunhoeffer ec841e2a11 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-09 13:20:46 +02:00
Max Neunhoeffer b1d33d1a76 Extra error output. 2016-06-09 13:20:36 +02:00
Kaveh Vahedipour 09535492d6 waitForCommit is new default behaviour of writes in agency 2016-06-09 13:14:19 +02:00
Max Neunhoeffer ebe0b5c64a Report result of DBSyncServerJob back to the heartbeat thread. 2016-06-09 12:03:34 +02:00
Andreas Streichardt f5e7187d8b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-09 11:33:49 +02:00
Andreas Streichardt c326a17cde Add init test 2016-06-09 11:31:39 +02:00
Max Neunhoeffer 263b9dd699 Uncomment move shard tests. 2016-06-09 10:55:44 +02:00
Max Neunhoeffer 8a4befc241 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-09 10:52:24 +02:00
Max Neunhoeffer 147873754b More tests. 2016-06-09 10:52:09 +02:00
hkernbach 2938b3f509 users view bugfix [ci skip] 2016-06-09 10:48:17 +02:00
hkernbach 51caac1cd2 users view bugfix, cluster dashboard change [ci skip] 2016-06-09 10:42:22 +02:00
Frank Celler 3d475189f1 only in system db 2016-06-09 09:50:53 +02:00
hkernbach ab674a56cc removed console logs [ci skip] 2016-06-09 09:23:55 +02:00
jsteemann 0c88932669 de-wurstung 2016-06-08 22:28:13 +02:00
Frank Celler a92d566234 added database.init-database 2016-06-08 21:40:21 +02:00
Kaveh Vahedipour 516ac10331 can start local cluster with multiple agents 2016-06-08 19:06:04 +02:00
hkernbach 758efcb611 removed console log 2016-06-08 17:28:09 +02:00
hkernbach cf84ffa248 grunt build 2016-06-08 17:19:29 +02:00
hkernbach 8a737b9c67 scale / nodes view 2016-06-08 17:16:59 +02:00
jsteemann 0d5e91e804 fixed jslint 2016-06-08 16:58:15 +02:00
jsteemann 3a247716e6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-08 16:55:51 +02:00
jsteemann abcc5c01e9 some fixes 2016-06-08 16:55:45 +02:00
Max Neunhoeffer ae2963ef8b Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-08 16:50:23 +02:00
hkernbach 57b55eae8e grunt build 2016-06-08 16:49:49 +02:00
hkernbach 2071cdd647 scale view 2016-06-08 16:48:40 +02:00
Max Neunhoeffer cc654de9e8 More tests for moving shards. 2016-06-08 16:42:11 +02:00
Michael Hackstein 84695c2ef1 Fixed JSLint 2016-06-08 16:33:02 +02:00
Michael Hackstein 88813b393d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-08 16:07:08 +02:00
Michael Hackstein 9c9ab164ae Fixed a bug in graph _paths if it was called without any direction. It generated an illegal query. 2016-06-08 16:06:51 +02:00
Max Neunhoeffer c427b7e136 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-08 15:54:31 +02:00
Max Neunhoeffer 49cd6ca9f4 Fix leaderResign (no double resign) and leader change. 2016-06-08 15:54:00 +02:00
Andreas Streichardt 496454df3f /_admin/shutdown will now need a DELETE request 2016-06-08 15:26:53 +02:00
Max Neunhoeffer d48f5506f2 Fix shard removeShardFollower functionality. 2016-06-08 14:59:39 +02:00
Max Neunhoeffer d8069692ca Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-08 10:00:37 +02:00
Max Neunhoeffer 659a06765d Let a follower unfollow a leader. 2016-06-08 10:00:19 +02:00
jsteemann 3eff414061 jslinting 2016-06-08 09:08:23 +02:00
Max Neunhoeffer 1eb4fc458f Add tests for cleanout server. 2016-06-08 00:05:26 +02:00
Max Neunhoeffer c85bd2fdbe Implement leader resignation. 2016-06-07 23:26:34 +02:00
Max Neunhoeffer fe5b9f9c23 Remove shard entries in Agency less eagerly. 
This fixes a bug about collections vanishing in Current.
 2016-06-07 23:01:56 +02:00
Michael Hackstein 5b7bdc36ef Disabled GRAPH_VERTICES tests. Not supported any more 2016-06-07 20:16:03 +02:00
Michael Hackstein b7be6cce4a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-07 20:10:41 +02:00