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

2553 Commits

Author SHA1 Message Date
Jan Steemann e4b51f616c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 17:46:03 +01:00
Jan Steemann 7e161b88ce issue #1131: added KEEP for `COLLECT...INTO` 2014-12-03 17:44:10 +01:00
Frank Celler 3e430276d6 Merge pull request #1145 from triAGENS/positional-query-args 
Support positional arguments in Foxx queries
 2014-12-03 14:48:39 +01:00
Jan Steemann 4f39b9e358 optimize away `INTO` of `COLLECT` if unused 2014-12-03 13:49:03 +01:00
Jan Steemann 8af441da56 Merge pull request #1148 from triAGENS/correct-horse-battery-staple 
Dev app baseUrls should be db-relative too
 2014-12-03 11:58:38 +01:00
Jan Steemann 9d197d3eb2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 11:39:04 +01:00
Jan Steemann 4ef82239a3 added optimizer statistics 2014-12-03 11:38:56 +01:00
Max Neunhoeffer 9a28d9914d Add new import tests to JS testsuite, fixing the "importing" target. 2014-12-03 11:27:44 +01:00
Max Neunhoeffer 8f1dd637c6 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-03 10:56:29 +01:00
Alan Plum 7a4076da8f Also accept `false` instead of an empty array. 2014-12-03 10:56:28 +01:00
Jan Steemann 8e2c5176f4 fixed segfault 2014-12-03 10:47:35 +01:00
Max Neunhoeffer 94e8bbe605 Fix error checking in unittests. 2014-12-03 10:45:51 +01:00
Alan Plum 7b01edbb4c Fixes #1146. 2014-12-03 10:24:50 +01:00
Alan Plum 741bf1e4d5 Support positional arguments in Foxx queries. 2014-12-02 18:29:25 +01:00
Alan Plum fdc4c1e810 Rename Repository#modelPrototype to avoid confusion. Added Repository#modelSchema. 2014-12-02 13:37:06 +01:00
James 0646a5a98e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	CHANGELOG
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	arangod/Aql/grammar.cpp
	js/server/tests/aql-optimizer-indexes.js
 2014-12-02 10:42:04 +00:00
James fed9e98aca Merge branch 'master' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	CHANGELOG
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	js/server/tests/aql-optimizer-indexes.js
 2014-12-02 10:36:06 +00:00
Patrick Huber f1c6c6cc24 allow to supply args to the optional 'transform' function in Foxx.createQuery() 2014-12-02 08:18:49 +01:00
Frank Celler 7c8b0228da recreate password if missing 2014-12-01 15:36:47 +01:00
Willi Goesgens 1024750c07 Clarify whether the test is running via arangosh or arangod. 2014-12-01 14:21:00 +01:00
Max Neunhoeffer d333ac5845 Cleanup cleanupDirectories list after cleanup of directories. 2014-11-28 17:56:16 +01:00
Jan Steemann aa37504e09 jslint 2014-11-28 17:55:01 +01:00
Jan Steemann b6e182fd0f added tests 2014-11-28 17:53:28 +01:00
Jan Steemann 42e7c64de6 fixed jslint warnings 2014-11-28 17:52:18 +01:00
Jan Steemann 544f7d4ab4 fix optimization of subqueries 
Conflicts:
	CHANGELOG
 2014-11-28 17:51:50 +01:00
Jan Steemann 99530f6478 fixed invalid optimization, added test cases 
Conflicts:
	CHANGELOG
 2014-11-28 17:50:17 +01:00
Alan Plum 234af094ec Expose root-relative mount URL as appContext.baseUrl. 2014-11-28 17:49:51 +01:00
Jan Steemann 1f5db121db renamed function, updated documentation 
Conflicts:
	CHANGELOG
 2014-11-28 17:46:29 +01:00
Jan Steemann 5bf621e756 added test case 2014-11-28 17:35:16 +01:00
Jan Steemann 06af1d3af2 added several AQL functions 2014-11-28 17:34:29 +01:00
Max Neunhoeffer faef09a576 Cleanup cleanupDirectories list after cleanup of directories. 2014-11-28 15:22:01 +01:00
Frank Celler dbf1d3bf30 recreate password if missing 2014-11-28 11:57:58 +01:00
Jan Steemann b3d46923f2 jslint 2014-11-27 13:08:09 +01:00
James 40a67f47c7 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
 2014-11-27 09:25:43 +00:00
Jan Steemann e7c7f774e0 added tests 2014-11-26 20:24:28 +01:00
Jan Steemann 513ae2b3dd fixed jslint warnings 2014-11-26 15:24:03 +01:00
Jan Steemann 57aefb988d fix optimization of subqueries 2014-11-26 15:01:55 +01:00
Jan Steemann e5adbf4f56 properly display required pathParams in Foxx documentation 
do not restrict route summary to 60 characters
 2014-11-26 11:21:14 +01:00
Jan Steemann 646af5175e properly display required pathParams in Foxx documentation 
do not restrict route summary to 60 characters
 2014-11-26 11:20:05 +01:00
Jan Steemann 37026e8c84 Merge pull request #1121 from triAGENS/appcontext-base-url 
Expose root-relative mount URL on applicationContext
 2014-11-26 10:28:42 +01:00
Jan Steemann c69fa0b0dc fixed invalid optimization, added test cases 2014-11-25 23:18:24 +01:00
Alan Plum a947b909a4 Expose root-relative mount URL as appContext.baseUrl. 2014-11-25 13:35:41 +01:00
James e73a05bb16 adjust further test 2014-11-22 16:07:10 +00:00
James 7f59881c99 fixing test 2014-11-22 16:03:11 +00:00
James b040a7e544 updating test 2014-11-22 15:52:03 +00:00
Thomas Schmidts 953fcd209e Another dead link in the documentation fixed 2014-11-21 09:48:34 +01:00
Thomas Schmidts e448502f2d Another dead link in the documentation fixed 2014-11-21 09:48:08 +01:00
Thomas Schmidts 403ab66198 Fixed some dead links in the documentation 2014-11-21 09:14:32 +01:00
Thomas Schmidts c6b8e1a569 Fixed some dead links in the documentation 2014-11-21 09:13:50 +01:00
Jan Steemann ed919090ea renamed function, updated documentation 2014-11-20 14:46:32 +01:00
Jan Steemann 620274047f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-functions 
Conflicts:
	CHANGELOG
 2014-11-20 14:23:01 +01:00
scottashton 28d7230d47 fixed a test 2014-11-20 11:07:24 +01:00
scottashton e36aa92f58 fixed a test 2014-11-20 11:06:50 +01:00
scottashton a5bc4aaa4a added new graph function _connectingEdges 2014-11-19 09:27:39 +01:00
scottashton 6075027484 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-19 09:26:51 +01:00
scottashton 6a418d3a05 added new graph function _connectingEdges 2014-11-19 09:26:40 +01:00
Lucas Dohmen c0a02f9f8a Merge pull request #1096 from sarhugo/model-events 
Model events
 2014-11-19 09:24:12 +01:00
Alan Plum 42d590dd71 Swagger models should reflect required properties. 2014-11-18 15:06:09 +01:00
Alan Plum a39d48cd0f Also respect required props in legacy schemas. Fixes #1097. 2014-11-18 15:05:58 +01:00
Lucas Dohmen dfc7901621 Merge pull request #1106 from triAGENS/mandatory-swagger 
Mandatory swagger (fixes #1097)
 2014-11-18 13:20:10 +01:00
Alan Plum 7e2468cc49 Also respect required props in legacy schemas. Fixes #1097. 2014-11-18 11:30:26 +01:00
Jan Steemann ea6c7a287c added test case 2014-11-18 11:27:38 +01:00
Jan Steemann baba563a78 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-functions 2014-11-18 11:27:06 +01:00
Jan Steemann f1f13a4284 added several AQL functions 2014-11-18 11:26:42 +01:00
Alan Plum 74f7d0ee5e Swagger models should reflect required properties. 2014-11-18 11:21:08 +01:00
Jan Steemann 2b92cf5edd issue #1104: edgeExamples broken or changed 2014-11-18 10:34:46 +01:00
Jan Steemann 53fbc02890 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-18 10:29:18 +01:00
Jan Steemann 9565d8f3b2 issue #1104: edgeExamples broken or changed 2014-11-18 10:29:10 +01:00
scottashton 8f3779b1eb added maxIterations param to GRAPH_EDGES and GRAPH_NEIGHBORS 2014-11-18 09:43:31 +01:00
scottashton 8635862224 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-18 09:42:26 +01:00
scottashton 40f270f22c added maxIterations param to GRAPH_EDGES and GRAPH_NEIGHBORS 2014-11-18 09:42:17 +01:00
Jan Steemann 32c1404eec added tests 2014-11-18 07:02:35 +01:00
Jan Steemann fc0b63967f fixed WITHIN_RECTANGLE for cluster 2014-11-18 07:02:08 +01:00
Jan Steemann 336d456beb issue #1100: HAS() fails on doc[attribute_name] 2014-11-18 07:01:51 +01:00
Jan Steemann 52b527bbe1 added tests 2014-11-17 13:55:35 +01:00
Jan Steemann 675e2a0d40 fixed WITHIN_RECTANGLE for cluster 2014-11-17 12:32:43 +01:00
Jan Steemann 065a5ecef0 issue #1100: HAS() fails on doc[attribute_name] 2014-11-17 11:38:57 +01:00
Max Neunhoeffer 257a382684 Fix tests with new estimateCost functions. 2014-11-16 20:12:46 -05:00
Max Neunhoeffer f4f4193368 Remove a test for cost estimation. 2014-11-15 21:30:17 -05:00
Max Neunhoeffer 57913a5f5a Fix another test for AQL and new estimates. 2014-11-14 23:13:00 -05:00
Max Neunhoeffer 752b603e5f Adjust local test (do not test whether cost estimate is zero). 2014-11-14 23:08:42 -05:00
Hugo Sarti ce66c0ffc6 Removed EventEmitter2. Using core events 2014-11-14 23:38:39 -03:00
Jan Steemann ac667d5e5a added tests 2014-11-14 13:27:33 +01:00
Jan Steemann 71c050d2fa renamed function 2014-11-14 13:06:44 +01:00
Hugo Sarti 619b8cf810 Before/After events at Repository.remove method 2014-11-13 10:55:53 -03:00
James f797afe0d5 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 2014-11-13 08:04:25 +00:00
Hugo Sarti 26451ea7c3 Before/After events at Repository.update method 2014-11-12 16:27:25 -03:00
Hugo Sarti 298f7dea1e Before/After events at Repository.save method 2014-11-12 16:05:59 -03:00
Jan Steemann 7cd1eb5474 more warnings 2014-11-12 14:52:54 +01:00
Jan Steemann 81c1919f44 minor adjustments for task API 2014-11-12 11:27:47 +01:00
Jan Steemann d6c38f39ed minor test adjustments 2014-11-12 08:50:13 +01:00
Jan Steemann 2d2ad1b4c6 added tests for accessing _from and _to of a non-edge collection 2014-11-12 08:28:24 +01:00
Jan Steemann 8c08a3b24a make `CONCAT` and `CONCAT_SEPARATOR` more useful 2014-11-12 00:07:03 +01:00
Jan Steemann 435016abcd added functions `VALUES` and `ASSEMBLE` 2014-11-11 23:07:45 +01:00
Jan Steemann 3ba00ca653 added `SUBSTITUTE` AQL function 2014-11-11 22:35:15 +01:00
Hugo Sarti 54812d1e02 Model as an EventEmitter 2014-11-11 18:22:07 -03:00
Jan Steemann 40ae5728e0 issue #1032: added `FIND_FIRST` and `FIND_LAST` 2014-11-11 18:05:04 +01:00
Jan Steemann 9ccf7b85f4 issue #1033: added SPLIT function 2014-11-11 16:35:40 +01:00
Jan Steemann 537ec80dc1 issue #1044: added LTRIM, RTRIM 2014-11-11 14:58:03 +01:00
Willi Goesgens d96907d8da Implement tastks REST api 
- Implement REST api for tasks
 - Implement wrappers in arangosh
 - Add API-documentation
 - move unittest from server to common
 2014-11-11 12:39:09 +01:00
James ed91b1b1cd fixing test. 2014-11-11 08:49:16 +00:00
James 3e612acdda Merge branch 'aql-feature-lazy-index' of ssh://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 2014-11-11 08:23:23 +00:00
James 08e8fd193e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 2014-11-11 08:21:40 +00:00
Jan Steemann ed8e06b88e added PERCENTILE function, draft 2014-11-10 18:10:59 +01:00
Jan Steemann 12d326d62b updated documentation and operators behavior 2014-11-10 18:05:11 +01:00
scottashton 5743bb2b58 added tests for is-in-polygon 2014-11-10 11:31:57 +01:00
scottashton 1feb2df0c9 added tests for is-in-polygon 2014-11-10 11:29:45 +01:00
Jan Steemann 37751ecc7a updated tests 
updated docs
 2014-11-10 10:54:50 +01:00
Jan Steemann 9c5d150866 use Ast::ReverseOperator 2014-11-08 22:31:31 +01:00
Jan Steemann 44d5dd2749 added test to Makefile, fixed jslint warning 2014-11-08 21:06:06 +01:00
James 31de49cccd adding comment 2014-11-08 17:35:39 +00:00
James e2b8456395 tests and bugfixes. 2014-11-08 17:31:30 +00:00
James e9b761f1ca another test for replace-or-with-in 2014-11-08 12:17:13 +00:00
scottashton f72554d01e added tests for aql functions within-rectangle and is-in-polygon 2014-11-07 15:55:41 +01:00
Jan Steemann d56cbde03f include points on the boundary 2014-11-07 13:54:50 +01:00
Jan Steemann b0de1bb226 leaner and meaner error messages 2014-11-07 10:53:00 +01:00
Willi Goesgens 9f7b4c5daa Adjust server threads / javascript.v8-contexts to the new reality. 2014-11-06 15:39:06 +01:00
Willi Goesgens 7e897ec39b Implement tests with sorting on texts 2014-11-06 13:35:04 +01:00
James 868a7339fd added 2 more tests for replace-OR-with-IN 2014-11-06 08:39:56 +00:00
Willi Goesgens 40abdb630b Add more possible performance comparisons 2014-11-05 15:30:25 +01:00
Jan Steemann bf30927913 removed canThrow tag for various built-in functions 2014-11-05 14:40:00 +01:00
Jan Steemann 19dc758c1a added test 2014-11-05 13:04:57 +01:00
Jan Steemann 7137647608 Merge branch 'aql-feature-optimize-or' of https://github.com/triAGENS/ArangoDB into devel 2014-11-05 11:37:10 +01:00
Jan Steemann cbb96b31c2 fixed jslint warnings 2014-11-05 11:20:20 +01:00
Jan Steemann 74ef8a71a2 added to Makefile 2014-11-05 11:20:04 +01:00
James 643bb4f43b more tests 2014-11-04 21:22:19 +00:00
James 9c71ee48c7 and more 2014-11-04 20:38:56 +00:00
James 206df8fc12 more tests. 2014-11-04 20:28:30 +00:00
Jan Steemann d99fe65aba fixed undefined 2014-11-04 14:40:31 +01:00
Willi Goesgens 09d2b4ee55 Add new perf tests. 2014-11-04 14:11:03 +01:00
Jan Steemann 6ad6d5ed60 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-04 12:43:14 +01:00
Jan Steemann 830da6dd51 issue #846: Add within_bounds function to AQL 2014-11-04 12:40:14 +01:00
Willi Goesgens 59d8260a4e Remove the foxx-manager tests from the all since they fail randomly depending on the availability of github. 2014-11-04 11:54:58 +01:00
James e51071525b Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-optimize-or 2014-11-04 08:38:28 +00:00
James a5fffd696e more tests 2014-11-03 20:46:18 +00:00
James d992b100fa tests complete. 2014-11-03 20:25:16 +00:00
Willi Goesgens 8c82a33972 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-03 15:43:29 +01:00
Willi Goesgens 7c1fc46e6d Make join-performance test an own suite, since the number of documents to be processed has to be different. 2014-11-03 15:42:48 +01:00
Jan Steemann c3a5b9a92d updated documentation 2014-11-03 15:32:00 +01:00
James 836fa08831 adding tests 2014-11-03 11:45:43 +00:00
Jan Steemann 9862c85464 fixed typos 2014-11-01 18:21:04 +01:00
Jan Steemann e669dc7c29 re-activated tests 2014-11-01 18:06:15 +01:00
Jan Steemann d1bf47a14a fixed issue when rolling back remove operations that could not remove from indexes 2014-11-01 18:03:57 +01:00
Jan Steemann e2cfa056c0 pass query warnings around in cluster 2014-11-01 16:36:58 +01:00
Jan Steemann af6891e545 fixed results 2014-10-31 20:17:08 +01:00
Jan Steemann 26c3b0174f fixed tests 2014-10-31 19:58:20 +01:00
Jan Steemann 4f68960ed7 removed Ahuacatl [skip ci] 2014-10-31 17:31:00 +01:00
Jan Steemann d954d2db98 fixed warnings 2014-10-30 19:23:11 +01:00
Jan Steemann 89c20d436c jslint 2014-10-30 19:18:47 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Willi Goesgens 501c721e72 Add jmeter JTL output format to perftests 2014-10-30 14:16:08 +01:00
Max Neunhoeffer 609adf0d37 Fix tests on cluster. 2014-10-30 10:57:31 +01:00
Max Neunhoeffer e5249582ed Fix tests in cluster. 2014-10-30 10:47:09 +01:00
Max Neunhoeffer 9a67b9a2cb Fix tests for cluster. 2014-10-30 10:17:52 +01:00
Jan Steemann 4418e58315 removed old-style Doxygen sections 2014-10-30 01:16:07 +01:00
Willi Goesgens 2c3c7155e0 Adjust test to cluster. 2014-10-29 16:22:31 +01:00
Willi Goesgens f3381ef0a8 Split cluster/noncluster for sort. 2014-10-29 15:39:30 +01:00
Willi Goesgens 34f84ee2d4 Fix lint. 2014-10-29 14:44:56 +01:00
Max Neunhoeffer e90bdfcf35 Fix two tests. 2014-10-29 13:51:48 +01:00
Jan Steemann ca15e72b14 fixed test 2014-10-29 12:33:10 +01:00
Willi Goesgens 6d40e00982 Implement offset for ports so we can run several jenkins jobs in paralell without clashes. 2014-10-29 10:39:44 +01:00
Max Neunhoeffer 18990d9b95 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-29 08:57:34 +01:00
Willi Goesgens a25f5aa513 Optionalize the availability of valgrind arguments. 2014-10-28 18:05:53 +01:00
Jan Steemann a1c28551ca jslintified 2014-10-28 16:05:32 +01:00
Jan Steemann 47f987cdc6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-28 16:01:50 +01:00
Willi Goesgens 9fe16ea5ca If cluster nodes run localy, we can check their health by statusExternal. 2014-10-28 16:00:18 +01:00
Jan Steemann 0e27ccbfdb jslintified tests 2014-10-28 15:59:38 +01:00
Jan Steemann 50f6129e47 jslintified tests 2014-10-28 15:02:37 +01:00
Willi Goesgens b3e6e35be0 Implement pass through of commandline arguments to arangod cluster instances 2014-10-28 13:28:20 +01:00
Max Neunhoeffer 693b0056cc Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-28 11:20:19 +01:00
Max Neunhoeffer 955a975b72 Fix test in cluster. 2014-10-28 11:01:21 +01:00
Max Neunhoeffer 77bc556ff2 Make cluster compatible by ignoring cluster always on rules. 2014-10-28 11:00:07 +01:00
Max Neunhoeffer cfb9b8a37a Add removeAlwaysOnClusterRules helper. 2014-10-28 10:59:27 +01:00
Max Neunhoeffer f3fdb8ff4e Rename again. 2014-10-28 10:58:59 +01:00
Max Neunhoeffer cc56e21ce0 Rename test. 2014-10-28 10:58:01 +01:00
Willi Goesgens 8040f8a27f Implement cluster start on valgrind 2014-10-27 18:30:59 +01:00
Jan Steemann 02c26720a4 fixed test 2014-10-27 17:10:25 +01:00
Jan Steemann b7c93c361a fixed tests 2014-10-27 16:43:10 +01:00
Jan Steemann 7a2f45ab1a fixed test 2014-10-27 13:30:45 +01:00
Jan Steemann eb53667346 fixed tests 2014-10-27 13:12:56 +01:00
Jan Steemann e581aa6612 fixed usage of AQL user-defined functions from web UI 2014-10-27 11:09:20 +01:00
James c41b1f8e5f proper tests for undistribute-remove-after-enum-coll and distribute-in-cluster 2014-10-25 16:37:22 +01:00
James 3b14c1f283 fixing undistribute-remove-after-enum-coll tests 2014-10-25 14:26:00 +01:00
James 9bcf115951 fixing distribute-in-cluster tests 2014-10-25 14:25:24 +01:00
Jan Steemann 29a4416bcf issue #1056: added tests for zipFile / unzipFile 
Conflicts:
	js/common/tests/shell-fs.js
	lib/BasicsC/tri-zip.c
 2014-10-25 01:21:47 +02:00
Jan Steemann 50ac6737a2 jslint 2014-10-25 00:45:15 +02:00
Thomas Schmidts d79ff5d74d Fixed broken links 2014-10-24 17:49:01 +02:00
Jan Steemann f87005ae0b attempt to make test more deterministic 2014-10-24 13:18:48 +02:00
Jan Steemann a3c05ccf3a attempt to make test more deterministic 2014-10-24 10:37:01 +02:00
Willi Goesgens 5158edd25d If tests fail, skip cleaning up of working directories. 2014-10-23 17:58:04 +02:00
Jan Steemann 3dc2f9b299 fixed test 2014-10-22 16:30:06 +02:00
Jan Steemann 5d178b7220 fixed test 2014-10-22 13:37:48 +02:00
James 2496a8dc3e fixing GatherBlock tests. 2014-10-21 17:04:49 +01:00
Alan Plum 2747bf8b04 Wrap non-Joi objects as Joi schemas. 2014-10-21 17:20:34 +02:00
Alan Plum 233f21662a Whitespace. 2014-10-21 17:10:51 +02:00
Alan Plum db323869f4 Fixed Foxx RequestContext::errorResponse for strings. 2014-10-21 17:10:50 +02:00
Jan Steemann 5d1986aafb fixed test 2014-10-21 14:50:37 +02:00
Jan Steemann 97a4355c4e fixed tests 2014-10-21 13:45:46 +02:00
Jan Steemann 6e7ed4c4d4 fixed tests 2014-10-21 13:01:24 +02:00
Jan Steemann c91355831b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-21 12:50:37 +02:00