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

2811 Commits

Author SHA1 Message Date
Jan Steemann a8e2e3021e added some tests 2016-05-20 12:15:19 +02:00
jsteemann 3b318805ec don't leak buffers 2016-05-19 18:15:08 +02:00
Max Neunhoeffer a73b348e77 Add TRI_SuspendExternalProcess and TRI_ContinueExternalProcess for Unix. 2016-05-19 14:06:57 +02:00
Andreas Streichardt aba66a50eb _listEndpoints => _endpoints() 2016-05-18 15:34:42 +02:00
Jan Steemann c6b883d41d fixed issue #1826 2016-05-18 11:40:58 +02:00
jsteemann 4f72db6451 speed up calls to user-defined functions 2016-05-13 23:08:39 +02:00
jsteemann 1faaa18f6e display "const" attribute 2016-05-13 18:51:20 +02:00
Andreas Streichardt 4d13e8fb1b _listDatabases() => _databases() 2016-05-11 15:30:47 +02:00
Alan Plum 6459b39159
Fix missing name/version in generated foxxes 2016-05-09 18:12:33 +02:00
jsteemann 4612869028 show execution location of execution nodes in ArangoShell 2016-05-09 15:58:14 +02:00
Michael Hackstein 8dd27b01f8 Added an Index and an AQL statement to the quickie test. 2016-05-09 09:39:23 +02:00
jsteemann e1f874ad4a jslint 2016-05-07 07:56:16 +02:00
Max Neunhoeffer b5c87fba33 Add a trivial quickie test and a convenience script. 2016-05-06 22:47:17 +02:00
Kaveh Vahedipour e623198d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 17:06:23 +02:00
jsteemann f2d014ff6a bugfixes 2016-05-04 16:10:04 +02:00
Alan Plum 7e2603bdcc Merge pull request #1811 from arangodb/kill-the-monkey 
Remove monkeypatches
 2016-05-04 11:42:24 +02:00
Kaveh Vahedipour 7ac2f7111a Merge branch 'json_agency_comm' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:48:48 +02:00
Andreas Streichardt f882db1436 Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 15:48:17 +02:00
Andreas Streichardt f5f040e21a Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 15:47:00 +02:00
Kaveh Vahedipour d2513d7579 wrong implementation of property collectionsetting through coordinator 2016-05-03 15:45:19 +02:00
Michael Hackstein be6b8908fa Fixed cluster crud tests. They did by accident not run into the untested state thus far. 2016-05-03 15:28:01 +02:00
Alan Plum 85950c9798
Remove monkeypatches.js 2016-05-03 14:55:32 +02:00
Alan Plum c1828234d6
Move shallowCopy and propertyKeys into @arangodb/util 2016-05-03 14:55:32 +02:00
Kaveh Vahedipour dab8accd5b Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 08:57:09 +02:00
Alan Plum 698dfae860
Print jshint exceptions to console 2016-05-03 00:51:49 +02:00
Alan Plum 53c7169d5b
Remove redundant test 
The name and version fields are now optional.
 2016-05-02 18:52:02 +02:00
Alan Plum 3bb355e3dc
Don't default to index.js 2016-05-02 18:47:37 +02:00
Alan Plum 8643f45c25
Add missing index.js files 2016-05-02 18:45:51 +02:00
Kaveh Vahedipour b791188f18 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 17:49:11 +02:00
Alan Plum 3fb6d517f7
Object#propertyKeys -> internal.propertyKeys 2016-05-02 17:34:08 +02:00
Alan Plum 571e07c613
Missed one 2016-05-02 17:23:51 +02:00
Alan Plum 4af0c67c5c
Unbreak shallowCopy 2016-05-02 17:19:01 +02:00
Kaveh Vahedipour 00ce93b8d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 16:14:37 +02:00
Kaveh Vahedipour 88ea3473b0 too much output in logs 2016-05-02 16:07:00 +02:00
Alan Plum 0c420c746c
Remove unused code 2016-05-02 15:53:58 +02:00
Alan Plum 53dc168a71
Linting 2016-05-02 14:42:10 +02:00
Alan Plum 2bd0f59d9d
Bump jshint to 2.9.2 2016-05-02 14:42:09 +02:00
Alan Plum f81c946fd7
app -> service 2016-05-02 14:42:08 +02:00
jsteemann 3bb0f5fbe1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 14:52:30 +02:00
Alan Plum c253026711
Support iterator API in query results 2016-04-29 13:30:55 +02:00
jsteemann 64ee910e38 move system attributes to the front of objects 2016-04-29 13:13:39 +02:00
jsteemann 285da023e5 ShapedJson removal 2016-04-27 00:45:15 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections 
Excluded Aardvark, the graph viewer in particular
 2016-04-20 22:09:00 +02:00
Alan Plum eea0a0e259
Deduplicate AQL template bindVars and support AQB 2016-04-20 16:18:19 +02:00
Alan Plum 2b0c1f6f9a
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 95b9f8db7e
Nevermind that 2016-04-20 13:45:17 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Alan Plum 8b7a98f2e8
global.aqlQuery -> arangodb.aql 2016-04-20 13:05:27 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Alan Plum 17854b57a8
Formatting 2016-04-19 18:16:18 +02:00
Jan Steemann c091031ec7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:12:06 +02:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Michael Hackstein 95662103f2 Fixed JSLint 2016-04-19 17:39:58 +02:00
Michael Hackstein 2c246c860c Fixed a bug in general-graph module. It was possible to create a graph using document collections for relations. This did lead into undefined behaviour. 2016-04-19 17:07:18 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Alan Plum ffcbd0a69e
Fix require tests 2016-04-19 09:29:24 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Alan Plum c39eca49e4
Add require.aliases 2016-04-18 18:01:06 +02:00
Alan Plum 6fc9b185eb
hasOwnProperty is now global 2016-04-18 18:00:41 +02:00
Alan Plum 27e4b43fa6
Fixup add ArangoCollection#isArangoCollection 2016-04-18 18:00:39 +02:00
Alan Plum 9cf8d347ad
More SyntheticResponse tests 2016-04-18 18:00:38 +02:00
Alan Plum 926f02ace5
Use mime-types 2016-04-18 18:00:35 +02:00
Alan Plum 22a8b5ec65
Add util.inline 2016-04-18 18:00:34 +02:00
Alan Plum ad717505fe
Add pluck to util 2016-04-18 18:00:29 +02:00
Alan Plum 95613be7c6
Mark ArangoDB result sets and errors 
This makes it easier to recognize them (see joi.isJoi).
 2016-04-18 18:00:29 +02:00
Alan Plum 314d19d20d
Extract router tree 2016-04-18 18:00:24 +02:00
Alan Plum 4b0fd593ce
Implement rudimentary route handling 2016-04-18 18:00:22 +02:00
Alan Plum 5161c63670
Remove magical Foxx comments 2016-04-18 18:00:18 +02:00
Alan Plum 4140c26d30
Use symbols for internal module props 2016-04-18 18:00:17 +02:00
Alan Plum c7688a72f8
module.requireCache -> module.require.cache 2016-04-18 18:00:17 +02:00
Alan Plum eacf570a39
applicationContext -> module.context 2016-04-18 18:00:17 +02:00
Alan Plum a385738601
Revert "fixed version" 
This reverts commit 034eea10b3.
 2016-04-18 18:00:17 +02:00
Jan Steemann 8430f1f71c added test case 2016-04-18 17:29:06 +02:00
Jan Steemann 1355618f67 added tests for indexes on "_key", "_from" and "_to" 2016-04-18 17:22:10 +02:00
Jan Steemann 0b07b77cf8 added index tests 2016-04-18 16:50:39 +02:00
Michael Hackstein 75015da169 Fixed JSLint 2016-04-18 13:43:09 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein cd12a07a4d Fixed return codes in cluster. They are now forwarded properly from DBServer to Client 2016-04-15 17:58:06 +02:00
jsteemann ecd7de16cb added optimizer rule "inline-subqueries" 2016-04-15 17:21:22 +02:00
Michael Hackstein a4f6844e27 Fixed babies test in error cases. 2016-04-15 15:53:21 +02:00
Michael Hackstein 20733a81ae Improved baby errors in cluster 2016-04-15 14:48:44 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
Michael Hackstein 1311f73775 Further fixes in cluster communication for baby case 2016-04-12 13:04:51 +02:00
Michael Hackstein 7991815376 Fixed property undefiend bug in test 2016-04-12 10:39:30 +02:00
Michael Hackstein eeb11919f9 Fixed expectation in cluster-crud test. We cannot guarantee that CHANGE_SHARDING_ATTRIBUTES is thrown, might be NOT_FOUND in some cases 2016-04-12 10:35:09 +02:00
Michael Hackstein 0bc206ff80 Further modification of document babies test 2016-04-12 08:51:16 +02:00
Michael Hackstein 474f70c9ad Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 16:33:08 +02:00
Michael Hackstein 5bc4bb51e6 Reactivated babies test in cluster 2016-04-11 16:32:25 +02:00
Michael Hackstein 0ec045d811 Removed debug output 2016-04-11 16:31:41 +02:00
Michael Hackstein 19139a7bf5 Modified document-babies tests. They are now green but correctness has to be discussed. 2016-04-11 16:29:04 +02:00
Wilfried Goesgens 81df4e6e85 migrate 1b41f5c0bb to devel. 2016-04-11 14:21:46 +02:00
Michael Hackstein 7313df2e5f Fixed babies-tests to fit the newest definition 2016-04-11 14:21:34 +02:00
Jan Steemann 947fb8d9ad make LIKE wildcards newline-aware 2016-04-11 14:02:12 +02:00
Michael Hackstein df497eb8b2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-10 14:09:25 +02:00
Michael Hackstein 68577f1a45 Fixed expectation of document-babies test. Not yet green 2016-04-10 14:09:18 +02:00
jsteemann e84a0ff0ad jslint argl 2016-04-09 01:02:59 +02:00
jsteemann f94f298862 deactivate babies tests temporarily 2016-04-08 23:50:02 +02:00
Jan Steemann 6df7221691 cleanup 2016-04-07 17:08:44 +02:00
Jan Steemann ce11474602 jslint 2016-04-07 16:40:21 +02:00
Frank Celler 58b9cf7e91 WIP 2016-04-07 15:40:11 +02:00
Jan Steemann 74794d16db Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:43:35 +02:00
Jan Steemann 83f18fa419 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 13:01:23 +02:00
Jan Steemann 513dc26fc1 make replication tests more deterministic 2016-04-07 13:00:30 +02:00
Michael Hackstein 015c5d2908 Fixed single-server babies test. Also made sure that the error header is capialized properly 2016-04-07 12:41:23 +02:00
Michael Hackstein 3e1b295d68 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-07 10:30:41 +02:00
Michael Hackstein 6847d3f4a7 Preperation to create documents on coordinator with baby awareness. 2016-04-07 10:27:01 +02:00
Jan Steemann 2a12f3d936 make tests a bit more robust? 2016-04-06 17:57:57 +02:00
Jan Steemann aae8ffa5e3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:46:47 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Michael Hackstein ff195124d2 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:51:30 +02:00
Michael Hackstein 074e949037 Fixed JSHINT 2016-04-06 09:51:19 +02:00
Jan Steemann f45b6eeb49 jslint 2016-04-06 09:50:39 +02:00
Michael Hackstein 98b4c43315 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:30:11 +02:00
Andreas Streichardt 3bdbded541 Fix linter errors 2016-04-05 18:45:39 +02:00
Jan Steemann 782b38e5fa Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-05 18:32:24 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +02:00
Michael Hackstein 1d43063189 Added check for error-code headers in new babies definition 2016-04-05 15:51:16 +02:00
Michael Hackstein 964535c315 Adapted document-babies-spec to newest version of babies API for insertion of documents. Test is now red 2016-04-05 14:54:58 +02:00
Andreas Streichardt 8859ee1de4 Fix line ending madness 
treat csv files as binary so we can CONSISTENTLY import csv files
containing \r\n on any system
 2016-04-05 11:21:24 +02:00
Michael Hackstein bdb0261d2e Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-05 10:32:06 +02:00
Michael Hackstein 64308f8ef5 General Graph now uses the new version to save edges with only one json object. instead of the (from, to, doc) used before 2016-04-05 10:31:50 +02:00
Max Neunhoeffer 765b6f6685 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-04-05 10:28:21 +02:00
Max Neunhoeffer b1963d2cee Fix replication in the sense that revs are now copied over. 2016-04-05 10:27:43 +02:00
Jan Steemann ebeb119f4d some test fixes 2016-04-04 18:20:18 +02:00
Kaveh Vahedipour 5caf02768c code beautification 2016-04-04 14:42:49 +02:00
Kaveh Vahedipour 1293c9301a agency's own endpoint is now derived from server.endpoint 2016-04-04 11:23:46 +00:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Michael Hackstein 17e7a32fa6 Made the geo index ensure test independent of Index ordering 2016-04-01 13:59:36 +02:00
Michael Hackstein a14120d239 Removed Test for new features. It cannot work in Cluster Case. Needs to be fixed later on. 2016-04-01 12:27:37 +02:00
Michael Hackstein 618c855c85 Cluster Methods now use the OperationOptions of transactions. And now reacts to these options accordingly incl returnNew/returnOld 2016-03-31 10:52:24 +02:00
Michael Hackstein 7c49288acb Disabled Document babies test in Cluster Mode. Should only be used cluster Internally 2016-03-30 17:40:03 +02:00
Michael Hackstein 237aea6b5b Removed tests for removed functions FIRST and LAST 2016-03-30 17:17:11 +02:00
Michael Hackstein 794f692865 Fixed crud test. exists with an old revision now throws Conflict. Former returned false. 2016-03-30 16:18:08 +02:00
Jan Steemann c7daf1531d Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:23:11 +01:00
Michael Hackstein ef834037df Fixed shell edges Test. The new version of edgeCollection.edge returns a unique array 2016-03-24 17:22:40 +01:00
Michael Hackstein 86513511df Fixed expected error code. was SHAPER_FAILED is now BAD_PARAMETER 2016-03-24 17:10:32 +01:00
Jan Steemann cda0646c83 removed unused error codes 2016-03-24 17:04:58 +01:00
Jan Steemann 688109bcc5 jslint 2016-03-24 15:55:13 +01:00
Jan Steemann eae423349f fixed test (well, cheating a bit) 2016-03-24 13:17:53 +01:00
Jan Steemann 007e0c6e5c fixed test 2016-03-24 13:14:59 +01:00
Jan Steemann f161a98ba4 test fixes 2016-03-24 12:46:08 +01:00
Jan Steemann ecbd17b992 fixed test 2016-03-23 19:13:03 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Jan Steemann 7975913fc5 fixed tests 2016-03-23 18:50:46 +01:00
Andreas Streichardt 8cdf8eebad More python fixes 2016-03-23 18:36:22 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
Jan Steemann 1a2fdb64ee removed unused test 2016-03-22 18:52:49 +01:00
Jan Steemann d763c102d6 fulltext fixes 2016-03-22 18:34:40 +01:00
Jan Steemann 2ab44cef03 fixed tests 2016-03-22 16:17:05 +01:00
Jan Steemann 7f95833505 fixed tests 2016-03-22 16:14:52 +01:00
Jan Steemann 04b436f0b5 fixed test 2016-03-22 15:18:34 +01:00
Jan Steemann d226175e91 test fixes 2016-03-22 15:15:43 +01:00
Jan Steemann 80413739d1 fixed test 2016-03-22 14:34:18 +01:00
Jan Steemann 45cc15fe45 fixes 2016-03-22 10:51:42 +01:00
Jan Steemann f0724447b6 fixed sparse index test 2016-03-21 17:08:42 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
jsteemann f12320277f bugfixes 2016-03-18 16:56:05 +01:00
Max Neunhoeffer af6f7bd0fa Fix jslint. 2016-03-18 11:12:34 +01:00
Max Neunhoeffer e9ad1ad954 Fix jslint. 2016-03-18 11:10:04 +01:00
Max Neunhoeffer bf77bd31e2 Fix jslint. 2016-03-18 11:08:52 +01:00
Max Neunhoeffer 20fb42afd5 Cleanup of tests. 2016-03-18 02:04:38 +01:00
jsteemann e0ce1cef5a make buffers somewhat usable 2016-03-17 22:47:22 +01:00
Max Neunhoeffer f44b8a6fa9 Add tests for babies DELETE HTTP /_api/document/<collection>. 2016-03-17 21:13:50 +01:00
Max Neunhoeffer 20d0e98462 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 18:50:33 +01:00
Max Neunhoeffer 827f2f4f44 Improve /_api/simple/remove-by-key. 
Fix more document methods.
 2016-03-17 18:49:52 +01:00
jsteemann a9cc127ffa Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 17:17:26 +01:00
Max Neunhoeffer 105fe3e406 Fix tests for documents. 2016-03-17 15:53:02 +01:00
jsteemann 6ce73b439c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 15:21:32 +01:00
Frank Celler 13603e876e safety check 2016-03-17 12:00:27 +01:00
Frank Celler 89cf60d217 added missing test 2016-03-16 23:36:48 +01:00
Frank Celler b39e20c6fc fixed endpoint 2016-03-16 23:29:56 +01:00
Frank Celler a92d280f81 added babies http test 2016-03-16 22:18:00 +01:00
Frank Celler f28f20883a cosmetics 2016-03-16 22:16:56 +01:00
Max Neunhoeffer 8b8019b28a Fix behaviour of remove. 2016-03-16 19:55:49 +01:00
Max Neunhoeffer c9b48ea24b Add babies tests for returnNew and returnOld. 2016-03-14 15:01:48 +01:00
Max Neunhoeffer 0bd5524a7f Fix new tests. 2016-03-14 14:06:56 +01:00
Max Neunhoeffer 5dd4426bf7 Add tests for returnNew and returnOld. 2016-03-14 14:05:21 +01:00
Max Neunhoeffer 8f6cd501aa Change behaviour of remove(), return data, allow returnOld. 2016-03-11 16:35:55 +01:00
Max Neunhoeffer a25df3aece Fix jslint problems. 2016-03-10 16:44:44 +01:00
Max Neunhoeffer 6e4a4d1f7b Add babies tests for document API. 2016-03-10 16:28:10 +01:00
Max Neunhoeffer df487862a8 Fix some more edge tests. 2016-03-10 13:08:02 +01:00
Jan Steemann 878865c53a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 17:57:07 +01:00
Alan Plum 075ca6a3a5 Request shouldn't set content-type header to "undefined" 
Fixes #1776.
 2016-03-09 13:10:41 +01:00
Jan Steemann 329b3d623f Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:24 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Max Neunhoeffer 6ca5132b89 Fix test for edge save. 2016-03-09 09:16:33 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Max Neunhoeffer 7c4d4ab36c Adjust test to (new) behaviour. 2016-03-08 18:46:15 +01:00
Max Neunhoeffer 4452578f5f Fix a test. 2016-03-08 17:46:08 +01:00
Jan Steemann 14a3d02ce7 simple query cleanup 2016-03-07 20:29:04 +01:00