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

3956 Commits

Author SHA1 Message Date
Alan Plum 44faf4428d Improved mocha integration 
Mocha tests now produce pretty XML files and log output for Jenkins.
 2016-01-12 18:49:50 +01:00
Alan Plum b11c74bd12 shell-foxx-repository-spec to mocha 2016-01-12 18:49:28 +01:00
Alan Plum 46c186b3df shell-foxx-query-spec to mocha 2016-01-12 18:49:27 +01:00
Jan Steemann 6937dbc489 aggregate fixes 2016-01-12 17:21:18 +01:00
Wilfried Goesgens fd3d282fb1 Merge pull request #1653 from arangodb/mocha-tests 
Add support for mocha in built-in test runner
 2016-01-12 09:35:35 +01:00
Wilfried Goesgens a884e73404 assertQueryError: also output the query that failed with the error message. 2016-01-12 09:20:01 +01:00
Alan Plum c4c8418b6d Add support for mocha in built-in test runner 2016-01-11 20:00:56 +01:00
jsteemann debeaeec07 less garbage collection 2016-01-11 12:43:05 +01:00
Max Neunhoeffer b0283077db Merge branch 'devel' into ClustUp2 2016-01-11 11:41:36 +01:00
Max Neunhoeffer e7eae3a73a Merge branch 'devel' into ClustUp2 2016-01-11 11:01:45 +01:00
Jan Steemann 8390793699 moved docu blocks into their own files 2016-01-07 16:39:19 +01:00
Jan Steemann 1e6a07426c collect refactoring 2016-01-07 14:10:32 +01:00
Jan Steemann ad1163e3bb refactoring for Aql COLLECT 2016-01-07 13:35:12 +01:00
Alan Plum 480194ae14 Add missing header to foxx/service 2016-01-06 18:47:13 +01:00
Alan Plum e2f3bfabd1 Fix typo in error message 2016-01-06 18:47:13 +01:00
Jan Steemann 1fc4c0d34e fixed hanging test 2016-01-05 17:58:36 +01:00
Alan Plum 1b25f98996 On Windows, posix-ify mocha test paths 2016-01-05 11:32:21 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Jan Steemann a15c18572f fixed test, added more tests 2016-01-04 19:33:18 +01:00
Jan Steemann 555a0286c2 make merging configurable in update-by-example API 2016-01-04 16:31:06 +01:00
Max Neunhoeffer d8bae80887 Snapshot, with debugging output. 2015-12-30 16:53:13 +01:00
Max Neunhoeffer ad5446bf49 Set heartbeat interval to 5s. 2015-12-29 15:49:37 +01:00
Max Neunhoeffer 8feb663890 Add synchronisation of follower shards. 2015-12-29 15:48:55 +01:00
Alan Plum 9ecc710491 Avoid _.clone 
Lodash's clone is subtlely different from underscore's and breaks with ShapedJson.
 2015-12-23 23:30:56 +01:00
Alan Plum de9ae5128a underscore -> lodash 2015-12-23 23:30:55 +01:00
Alan Plum a1b816e4f3 Update copyright headers 2015-12-23 23:30:43 +01:00
Alan Plum 840c432904 org/arangodb -> @arangodb in Foxx generator 2015-12-23 23:25:50 +01:00
Max Neunhoeffer 394057fbda Merge branch 'devel' into vpack 2015-12-23 15:09:20 +01:00
Jan Steemann 8781c2d05d added tests 2015-12-23 14:38:48 +01:00
Max Neunhoeffer 9796661ede Make entropy test less sensitive. 2015-12-23 14:12:57 +01:00
Jan Steemann 887e93babc index handling fixes 2015-12-23 14:01:14 +01:00
Max Neunhoeffer 3996d2e6a2 Merge branch 'devel' into vpack 2015-12-23 08:35:59 +01:00
jsteemann 3d6582ed52 micro optimizations 2015-12-22 21:58:20 +01:00
Jan Steemann 5aebcbd91d Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 18:05:35 +01:00
Jan Steemann 6e3878ec94 changed behavior of [*] operator, added COLLECTION_COUNT internal function 2015-12-22 18:03:59 +01:00
Max Neunhoeffer 5f3a1fbdb2 Merge branch 'devel' into vpack 2015-12-22 14:18:34 +01:00
Alan Plum cad8c3841a Replace exportCache with app.main.loaded 2015-12-21 19:30:15 +01:00
Alan Plum ff23c28a44 Invalidate export cache when app is reloaded 2015-12-21 19:27:16 +01:00
Max Neunhoeffer 61fe51072c Merge branch 'devel' into vpack 2015-12-21 15:22:46 +01:00
Max Neunhoeffer 8ce0a484e1 Fix graph traversal tests, behaviour and documentation. 2015-12-21 15:20:56 +01:00
Michael Hackstein 60df6b70fc Moved traveral tests into the correct suite. This caused the build to fail 2015-12-21 13:25:02 +01:00
jsteemann 19782a45a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-18 23:33:44 +01:00
Jan Steemann 36eac6ffd0 fixed index selection in some queries 2015-12-18 20:16:09 +01:00
Michael Hackstein ccc23eda16 Added some more edge cases tests for graph traverser 2015-12-18 16:18:01 +01:00
Max Neunhoeffer b227b71c96 Remove name from collection properties for shards. 2015-12-18 15:34:37 +01:00
Jan Steemann 8053911c39 tests for issue #1583 2015-12-18 12:15:52 +01:00
Wilfried Goesgens 52e79fbe53 Fix lint 2015-12-17 14:16:46 +01:00
Wilfried Goesgens 58dbb81eba Cleanup; test de/serlialization. 2015-12-17 13:49:43 +01:00
Wilfried Goesgens d28f87b574 - Test de/serialization of filter arguments 
- test multiple edge collection with in and outbound edges
 2015-12-17 13:47:54 +01:00
jsteemann c786d9ff5f re-activated tests. jstlint complained about that 2015-12-16 20:13:33 +01:00
Wilfried Goesgens 06005c6939 Also test to de/serialize plans with expressions 2015-12-16 17:07:44 +01:00
Jan Steemann f48e779565 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-16 12:19:37 +01:00
jsteemann b5fa1b4629 extremeVerbosity 2015-12-16 11:48:04 +01:00
Jan Steemann 47d9fd1499 fixed jslint 2015-12-16 11:45:08 +01:00
Michael Hackstein 2867ff1eb4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-16 10:52:08 +01:00
Michael Hackstein e6e66d4469 Fixed a bug in Traversal Path Uniqueness. 2015-12-16 10:51:54 +01:00
Wilfried Goesgens e096903af6 Add comments howto configure the system so we can do automatic coredump analysis 2015-12-16 10:20:19 +01:00
Alan Plum b61d08efce applicationContext.foxxFilename -> applicationContext.fileName 2015-12-16 01:57:30 +01:00
Alan Plum 8b05198e17 Remove duplication 2015-12-16 01:41:20 +01:00
Alan Plum b8b0aa02f4 Remove unnecessary deprecation warnings 2015-12-16 01:16:38 +01:00
Alan Plum 318cf45def fix console.warn in Foxx 2015-12-16 01:16:38 +01:00
Alan Plum 8cd34bc586 Fix UndocumentedBody 2015-12-16 01:16:37 +01:00
Alan Plum ac291a9a17 Remove redundant test 2015-12-16 01:16:37 +01:00
Alan Plum 0c913dfbcf Make the Foxx console behave as documented 2015-12-16 01:16:37 +01:00
Alan Plum 78979e6a0c Revert unnecessary changes 2015-12-16 01:16:36 +01:00
Alan Plum ea419c671e Make activateAuthentication actually work again 2015-12-16 01:16:36 +01:00
Alan Plum 220468ec45 Add Model.toJSONSchema for 2.5 compat 2015-12-16 01:16:36 +01:00
Alan Plum ecfc00098e Lint 2015-12-16 01:16:35 +01:00
Alan Plum 64d3744594 Add jwt support back to Foxx sessions 2015-12-16 01:16:35 +01:00
Alan Plum c09b000d01 Make sessions more backwards compatible again 2015-12-16 01:16:35 +01:00
Alan Plum 06135043c1 Undeprecate Foxx.requireApp 2015-12-16 01:16:35 +01:00
Alan Plum 35b1f4e84f More undeprecation 2015-12-16 01:16:34 +01:00
Alan Plum 07209e278a Don't deprecate addInjector in 2.x 2015-12-16 01:16:34 +01:00
Alan Plum c7c8ee90ae Goodbye ES2015 classes 2015-12-16 01:16:33 +01:00
Alan Plum abbf019256 ctrl.del will not be removed in 2.9 2015-12-16 01:16:33 +01:00
Alan Plum 9c4bb1500d Linting 2015-12-16 01:16:32 +01:00
Alan Plum 0d6c70b4ee Remove ramda from npm deps 2015-12-16 00:10:19 +01:00
Alan Plum 0223b59233 Quotes 2015-12-16 00:09:41 +01:00
Max Neunhoeffer 0198b4576b Merge branch 'devel' into ClustUp1 2015-12-15 20:40:52 +01:00
Alan Plum 5947e2d9a8 fix console.warn in Foxx 2015-12-15 18:16:42 +01:00
Michael Hackstein 6636dec958 Added a test for traversal path uniqueness 2015-12-15 18:04:09 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Michael Hackstein 5235ced456 out/in/edges on an edge collection in a cluster now works for an array of vertices as well 2015-12-15 16:39:04 +01:00
Michael Hackstein 0496f16812 Added a test for AQL edges illegal start vertex values. Tests the reported errors 2015-12-15 16:38:21 +01:00
Michael Hackstein c6e64fc99d Added tests for EDGES to work with Object input 2015-12-15 16:38:14 +01:00
Michael Hackstein 806e8f6d17 Added a test for Array Input in AQL EDGES 2015-12-15 16:37:58 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Max Neunhoeffer 413e66b432 Merge branch 'devel' into ClustUp1 2015-12-15 11:59:25 +01:00
Jan Steemann aa99434c8c fixed test 2015-12-15 11:57:52 +01:00
Max Neunhoeffer 8a69ca5367 Merge branch 'devel' into ClustUp1 2015-12-15 09:23:51 +01:00
Wilfried Goesgens f51e5efb34 Implement tests for de/serializing of TraversalNodes. 2015-12-14 18:07:04 +01:00
Max Neunhoeffer 27cf790fef Merge branch 'devel' into ClustUp1 2015-12-14 16:46:30 +01:00
Jan Steemann 5a4165fd54 removed debug output 2015-12-14 14:34:57 +01:00
Jan Steemann 917892a52a added tests 2015-12-14 11:41:30 +01:00
Max Neunhoeffer 525e54d5a0 Merge branch 'devel' into ClustUp1 2015-12-14 11:26:10 +01:00
Jan Steemann 90ff8508ac set `extremeVerbosity` to false 2015-12-14 10:03:52 +01:00
jsteemann 51c267cd2a dont optimize in certain cases when its useless 2015-12-14 00:12:14 +01:00
jsteemann 600c48375d added optimizer rule `sort-in-values` 2015-12-13 23:33:44 +01:00
Jan Steemann 23367b098b make test output verbose more configurable 2015-12-11 17:54:40 +01:00
Jan Steemann a61589cfdc jslint 2015-12-11 16:35:02 +01:00
Jan Steemann 5ae891ac20 fix for issue #1603 2015-12-11 16:24:33 +01:00
Max Neunhoeffer 95b311f802 Merge branch 'devel' into ClustUp1 2015-12-11 13:33:33 +01:00
jsteemann 18e47457a6 fixes 2015-12-11 13:29:18 +01:00
Max Neunhoeffer c11ec07564 Merge branch 'devel' into ClustUp1 2015-12-11 13:28:07 +01:00
Jan Steemann 4335af50e7 replication improvements 2015-12-10 19:07:10 +01:00
Max Neunhoeffer 7a91accb71 Merge branch 'devel' into ClustUp1 2015-12-09 15:19:11 +01:00
Wilfried Goesgens 181db60b49 break if server is dead. 2015-12-09 13:43:04 +01:00
Alan Plum d3e2f75c33 Make require behave again 
Calls to require should stay within the ArangoDB paths or Foxx service root.

The require cache for Foxx services should be service specific.

Reloading a service's controllers should clear the service's require cache.

See #1577.
 2015-12-09 13:33:41 +01:00
Max Neunhoeffer 3f78b86492 Merge branch 'devel' into ClustUp1 2015-12-09 09:04:00 +01:00
jsteemann f13ffb4dff jslint 2015-12-09 00:21:55 +01:00
Max Neunhoeffer a0f6a3c9db Merge branch 'devel' into ClustUp1 2015-12-08 23:21:46 +01:00
Max Neunhoeffer 06a7196924 Fix test that checks etcd version numbers. 2015-12-08 21:31:46 +01:00
Max Neunhoeffer ec4e37b2f9 Merge branch 'devel' into ClustUp1 2015-12-08 20:13:17 +01:00
Jan Steemann 4cd2621d06 adjusted AQL function return values 2015-12-08 19:45:32 +01:00
Alan Plum 6b4fbdc5a7 Make the Foxx console behave as documented 2015-12-08 18:42:13 +01:00
Max Neunhoeffer 4e523a19ed Merge branch 'devel' into ClustUp1 2015-12-08 17:02:14 +01:00
Jan Steemann ee6792dd6b fixes for traversal and multi-modify 2015-12-08 14:50:05 +01:00
Max Neunhoeffer 257c6c897d Fix bugs and tests. 2015-12-08 12:48:11 +01:00
Jan Steemann 7c7fc5175b jslint 2015-12-08 12:44:37 +01:00
Jan Steemann a3f42b5072 renamed test method 2015-12-08 11:49:45 +01:00
Jan Steemann bbe8d5bb1f reduced wait period 2015-12-07 17:10:07 +01:00
Wilfried Goesgens ad8948057e Add timestamp to the output of testing.js before it starts rspec tests 2015-12-07 16:34:16 +01:00
Jan Steemann f707eddbcc added tests 2015-12-07 16:06:58 +01:00
Jan Steemann 1daeb7ad28 deadlock tests for drivers 2015-12-07 15:01:35 +01:00
Max Neunhoeffer a8a9f1832b Merge branch 'devel' into ClustUp1 2015-12-04 23:06:11 +01:00
Jan Steemann a53da38fcd fixed some cluster queries 2015-12-04 17:07:36 +01:00
Max Neunhoeffer 48ca59b4c0 Merge branch 'devel' into ClustUp1 2015-12-04 16:08:29 +01:00
Jan Steemann b6302a89df valgrind test fix 2015-12-04 15:37:17 +01:00
Max Neunhoeffer 60df924ac1 Change data structures for collections in Agency. 
Snapshot, compiles, untested, needs new VelocyPack.
 2015-12-04 15:08:47 +01:00
Max Neunhoeffer a926c7570a Cleanup ClusterInfo library w.r.t. Current/Collections. 2015-12-04 15:08:47 +01:00
Wilfried Goesgens de86282978 add -, we do so in all other cases. 2015-12-04 14:24:10 +01:00
Wilfried Goesgens 08942dc729 Numeric functions seem to behave different in valgrind; therefore add a way to skip these tests. 2015-12-04 14:23:03 +01:00
Michael Hackstein 741fa73814 JSLint 2015-12-04 12:29:14 +01:00
Michael Hackstein 9a724cd5a6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-04 11:21:28 +01:00
Michael Hackstein 07e1bac837 Added tests for AQL traverser that check correctness if vertices are missing on the path 2015-12-04 11:20:24 +01:00
Jan Steemann 3b1df26a79 added AQL function `IS_DATESTRING` 2015-12-04 10:53:01 +01:00
Jan Steemann 3016c974fc added tests 2015-12-03 16:51:52 +01:00
Jan Steemann ec3ab298e1 added test for traversal after data modification 2015-12-03 13:46:11 +01:00
Jan Steemann b404223212 jslint 2015-12-03 13:07:17 +01:00
Jan Steemann cb0d98cb6c added test cases for multi-modify 2015-12-03 12:18:03 +01:00
Jan Steemann d572f3ed03 Merge branch 'aql-multi-modify' of https://github.com/arangodb/arangodb into devel 2015-12-03 11:38:30 +01:00
jsteemann cb1c27c5c0 fixed jslint warnings 2015-12-03 11:24:52 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
Michael Hackstein b2e4673c65 Added a test for early filtering of < <= => > in Traversal 2015-12-02 17:52:01 +01:00
Michael Hackstein 23e2ac5da7 Fixed status reporting for Cluster and Single Server Case for the AQL Traverser Node. 2015-12-02 17:20:09 +01:00
jsteemann 9fa0f6d3a7 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-02 16:38:50 +01:00
Jan Steemann 30001804c1 jslint 2015-12-02 16:12:30 +01:00
Jan Steemann 0ec9d342a7 added test 2015-12-02 15:50:00 +01:00
Jan Steemann 3a7eca45b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-02 15:41:51 +01:00
Jan Steemann 61a8e4c686 issue #1593: add POW() AQL function 2015-12-02 15:41:30 +01:00
Jan Steemann 460b51734e fixed disappearing of documents for collections transferred via `sync` if the collection was dropped right before synchronization and drop and (re-)create collection markers were located in the same WAL file 2015-12-02 14:48:08 +01:00
Max Neunhoeffer 43d9dde8cd Slightly adapt sensitivity of a test to avoid false positives. 2015-12-02 14:46:01 +01:00
Wilfried Goesgens eb797f5e2f Remove anonymous wrapper function so this test harmonizes with our testing framework. 2015-12-02 14:17:18 +01:00
Max Neunhoeffer 3556f76469 Fix ClusterComm::asyncRequest w.r.t. body shared_ptr. 2015-12-02 14:15:18 +01:00
Michael Hackstein eca008fc33 Fixed test for Traverser AQL statistics. It now tests the desired optimization state including early pruning of paths 2015-12-02 13:37:13 +01:00
Michael Hackstein 1a13af6f36 Merged remote changes with local stash 2015-12-02 11:34:58 +01:00
Alan Plum 125f825420 Add process to system modules (because it's global) 2015-12-01 19:53:34 +01:00
Wilfried Goesgens 4b861dd44a Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-12-01 16:37:06 +01:00
Wilfried Goesgens 60819f9e80 Fix spelling for starting valgrind db servers 2015-12-01 16:36:23 +01:00
hkernbach 6d25ac57e9 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-01 11:25:58 +01:00
jsteemann 49af794f5d Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-01 01:56:46 +01:00
jsteemann 04e81ea851 more replication 2015-11-30 23:33:59 +01:00
Michael Hackstein 32496735fe Fixed all tests in JSUnityVersion. Now missing stats 2015-11-30 17:54:34 +01:00
Michael Hackstein d42d49f82b Renamed aql-graph-traverser test. It is not supposed to be executed with Jasmine any more 2015-11-30 17:36:27 +01:00
Michael Hackstein a9a8f1644d Use jsunity for graph traverser tests, jasmine report is simply useless in our framework 2015-11-30 17:35:48 +01:00
Michael Hackstein 8a01687565 Moved AQL graph tests into the server side. All other AQL tests are there as well 2015-11-30 15:20:03 +01:00
Michael Hackstein e9a36a3fbf Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-30 14:17:44 +01:00
Jan Steemann b11e88400b added tests for specific cluster queries 2015-11-30 13:56:31 +01:00
Jan Steemann e0392653f7 fixed error message 2015-11-30 13:45:31 +01:00
Jan Steemann 21b4307a55 renamed files 2015-11-30 13:12:55 +01:00
Wilfried Goesgens 55b8fb0c6f Fix links not to point to .html - .md is right, else the non-html generators won't work properly. 2015-11-27 11:51:29 +01:00
Michael Hackstein a93fcac0e8 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-27 09:29:01 +01:00
Wilfried Goesgens aae19ff291 Fix dangling anchors and add checker script to the make target. 2015-11-26 18:51:39 +01:00
Michael Hackstein 7bf37620bb Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-26 16:32:26 +01:00
Alan Plum ec49f5783b Remove FormatMiddleware 
Fixes #971.
 2015-11-25 13:19:00 +01:00
Jan Steemann 9b1ef915eb issue #1589 2015-11-25 10:49:31 +01:00
Alan Plum 7538d71333 URL parameter -> {query,path} parameter 2015-11-24 18:09:43 +01:00
Alan Plum 01aaa5f95a Adjust docs so it no longer implies IDs in ArangoDB might be numbers 
Fixes #1408.
 2015-11-24 16:18:37 +01:00
hkernbach 2d417e393d Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-24 13:24:12 +01:00
Alan Plum 3bd39234ec Treat empty string as null in optional Foxx configs 
Fixes #1495.
 2015-11-24 13:14:41 +01:00
Jan Steemann 95c00332c7 adjusted tests for issue #1583 2015-11-20 11:53:55 +01:00
Jan Steemann 268c0d49ad tests for issue #1583 2015-11-20 11:32:06 +01:00
jsteemann cb62c657e0 initial commit 2015-11-18 17:46:19 +01:00
Michael Hackstein 7a36bbb43f Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-18 13:58:47 +01:00
Michael Hackstein 10529ba474 Removed invalid test queries from Test 2015-11-18 09:42:04 +01:00
Max Neunhoeffer eec37d1e8b Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-11-17 17:17:10 +01:00
Jan Steemann 2ccfe1471f make replication tests a bit more robust 2015-11-17 15:27:38 +01:00
Jan Steemann 82eddeb120 allow using array indexes without specifying the `[*]` extension 2015-11-17 14:03:58 +01:00
Max Neunhoeffer 48c121bb24 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-11-17 11:46:19 +01:00
Alan Plum ce8ddcfe1d Fix #1574 2015-11-16 18:50:37 +01:00
Wilfried Goesgens 734d053a15 Adjust error code to non-cluster case. 2015-11-16 17:22:03 +01:00
Wilfried Goesgens 5dd70c78c0 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-16 15:55:33 +01:00
Max Neunhoeffer 8c2be32b48 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-11-13 15:08:39 +01:00
Wilfried Goesgens 7a41ef1e00 Output a real descritption of whats happening with the arangosh instead of dumping the start parameters 2015-11-12 10:39:55 +01:00
Wilfried Goesgens 91fccfd7ea AQL_NEIGHBORS: make the error checking behaviour similar to the non-cluster version. 2015-11-12 10:36:23 +01:00
jsteemann 8b9a8b80b5 fix broken build 2015-11-12 01:19:01 +01:00
Wilfried Goesgens 66e9cf70fc Add a test which validates proper exit codes of arangosh on throw () or regular exit. 2015-11-11 17:37:13 +01:00
Wilfried Goesgens 2d5d2d881e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-11 11:05:06 +01:00
Max Neunhoeffer c2c8bf95f3 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-11-11 10:47:30 +01:00
Wilfried Goesgens ad94f83b1b Adjust test to new error codes. 2015-11-10 15:00:34 +01:00