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

10607 Commits

Author SHA1 Message Date
Michael Hackstein 6847d3f4a7 Preperation to create documents on coordinator with baby awareness. 2016-04-07 10:27:01 +02:00
Kaveh Vahedipour a315997617 callback redesign 2016-04-07 10:20:08 +02:00
hkernbach 00fb467592 Merge remote-tracking branch 'origin/devel' into frontendmerge 2016-04-06 19:06:46 +02:00
Jan Steemann 2a12f3d936 make tests a bit more robust? 2016-04-06 17:57:57 +02:00
Jan Steemann b5b1fd705c removed obsolete tests 2016-04-06 17:48:11 +02:00
hkernbach 090f5416a3 grunt 2016-04-06 17:45:33 +02:00
hkernbach 4578b66441 merging web interfaces 2016-04-06 17:44:22 +02:00
Jan Steemann a62d863238 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 17:39:34 +02:00
Andreas Streichardt bdda4952ef Fix replication still requiring planner 2016-04-06 17:34:43 +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
Kaveh Vahedipour 57619d105c new document api 2016-04-06 13:43:31 +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 25df08e872 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:47:28 +02:00
Jan Steemann 18204c57e8 fixed replication tests 2016-04-06 09:41:31 +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
Andreas Streichardt c2cf4be4e0 Remove etcd 2016-04-05 18:41:37 +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 bad100312f fix testing 2016-04-05 14:16:48 +02:00
Andreas Streichardt 529199a9c3 streamline error log handling 2016-04-05 13:35:48 +02:00
Andreas Streichardt d46fba735b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-05 12:19:10 +02:00
Andreas Streichardt 0ac34f174a Fix agency test invocation 2016-04-05 12:18:53 +02:00
Jan Steemann 368f7e7f69 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-05 11:29:58 +02:00
Jan Steemann 19c06e01dd fixed wrong text 2016-04-05 11:29:41 +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
Andreas Streichardt 6554cd9cee Fix dumpand restore stuff 2016-04-05 10:31:33 +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
Andreas Streichardt bda650e112 remove oboslete variables 2016-04-05 08:46:21 +02:00
Andreas Streichardt 47facc7f50 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-04 19:27:53 +02:00
Andreas Streichardt 49a3d3e018 Cleaning up the ifs....Greatly simplifying testing.js 2016-04-04 19:26:30 +02:00
Michael Hackstein 715c6fccf6 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-04 18:41:40 +02:00
Michael Hackstein dc58c5d769 Fixed Modify edges in cluster test. Expected old return codes 2016-04-04 18:41:28 +02:00
Jan Steemann ebeb119f4d some test fixes 2016-04-04 18:20:18 +02:00
Andreas Streichardt a0e6778ab2 fix jslint 2016-04-04 18:16:45 +02:00
Andreas Streichardt 91df9e36b2 Merge branch 'agency' into devel 2016-04-04 15:50:25 +02:00
Andreas Streichardt 675ccf06f9 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-04 15:22:42 +02:00
Andreas Streichardt 1150d2b06a Talk to coordinator 2016-04-04 15:11:10 +02:00
Kaveh Vahedipour 9bfa55120a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-04 14:58:34 +02:00
Kaveh Vahedipour 47bac5b4d9 temporary fix of jslint errors 2016-04-04 14:58:25 +02:00
Kaveh Vahedipour 3d3f11ef54 comments 2016-04-04 12:55:18 +00:00
Kaveh Vahedipour 5caf02768c code beautification 2016-04-04 14:42:49 +02:00
Kaveh Vahedipour 062a759bca Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-04 12:13:48 +00:00
Kaveh Vahedipour 723eb01cee merging back from agency 2016-04-04 12:13:43 +00:00
Andreas Streichardt e5850658fb Merge branch 'devel' of github.com:arangodb/arangodb into agency 2016-04-04 13:36:22 +02:00
Andreas Streichardt 3b81a1cd3d Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-04 13:35:59 +02:00
Andreas Streichardt d56500b4c0 Implement cluster tests 2016-04-04 13:35:30 +02:00
Kaveh Vahedipour 1293c9301a agency's own endpoint is now derived from server.endpoint 2016-04-04 11:23:46 +00:00
Michael Hackstein 303dacbc30 Fixed skip in Cordinator case GEO and FULLTEXT index if no limit is set 2016-04-01 16:31:12 +02:00
hkernbach f0bb30c3f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-01 15:41:28 +02:00
hkernbach d464d69406 query view now reacts to a killed query 2016-04-01 15:41:20 +02:00
Kaveh Vahedipour 3127b4227b ttl overwright 2016-04-01 14:45:42 +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
Kaveh Vahedipour cfcffb7a41 jslint error in agency test correctedush 2016-03-31 21:32:12 +00:00
Kaveh Vahedipour 219df61370 jslint error in agency test corrected 2016-03-31 20:52:04 +00:00
Kaveh Vahedipour 1d536a2364 jslint error in agency test corrected 2016-03-31 20:24:56 +00:00
Michael Hackstein e32df21b2c Also reverted simple geo queries to old version to make them functional again 2016-03-31 17:34:21 +02:00
Kaveh Vahedipour 18d0528c1c Merge back from agency 2016-03-31 17:12:57 +02:00
Kaveh Vahedipour 394dcdb46b added more precondition and ttl tests 2016-03-31 16:50:00 +02:00
Michael Hackstein fb2b7b6b0f Fixed FullText index in cluster. Newest implementation ended up in an endless Loop. Reverted to original version. 2016-03-31 16:20:20 +02:00
Kaveh Vahedipour 8ac7491e53 cleaning up log messages. corrected agency test for failed precondition. 2016-03-31 16:10:25 +02:00
Kaveh Vahedipour caeafa4113 fixed broken agency test 2016-03-31 16:02:44 +02:00
Alan Plum 77fc097601 Use _scanFoxx(replace:true) 2016-03-31 15:49:55 +02:00
Alan Plum 5a98ed9600 Always run _scanFoxx in a transaction 2016-03-31 15:00:37 +02:00
Kaveh Vahedipour 66d668ba13 merge back from agency 2016-03-31 11:50:05 +00:00
Kaveh Vahedipour 2ddc1cd8ec i am a teapot if value not found and only a single search string is requested 2016-03-31 11:44:02 +02:00
Frank Celler 2f2b0b9741 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-31 11:12:17 +02:00
Michael Hackstein 7eb4b2b730 Removed JS implementation of edges. The new CXX AQL implementation can server for CLuster as well. 2016-03-31 11:11:35 +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
Frank Celler 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Michael Hackstein 118cc6c141 Reoming Documents in Cluster case now reacts to old revisions 2016-03-30 18:19:45 +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
Alan Plum 7918975f77 Port fix for #1742 to 3.0 2016-03-30 16:14:18 +02:00
Alan Plum 963fa8f9ff Port #1742 test to 3.0 2016-03-30 16:14:17 +02:00
Michael Hackstein 9d70091713 The RestEdges handler now behaves identically to the server side edges() functions. Specifically it does not return duplicate edges any more. Also added a helper function to build an EdgeIndex Lookup from VPackArray. 2016-03-30 10:13:09 +02:00
hkernbach 5612218835 spotlight view, query view, grunt build, scss 2016-03-29 17:28:08 +02:00
hkernbach dee5e6d118 query view support mac meta key 2016-03-29 15:53:22 +02:00
Kaveh Vahedipour cdc37d65fc Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-03-29 15:50:32 +02:00
Kaveh Vahedipour 1154a0db96 bug in increment and decrement in agency solved. 2016-03-29 15:49:33 +02:00
Kaveh Vahedipour a48b795b44 bug in increment and decrement in agency solved. 2016-03-29 15:48:49 +02:00
hkernbach d9347f576b query view copy to editor bugfix 2016-03-29 15:23:10 +02:00
hkernbach 2a571d1f6b query view bugfix 2016-03-29 15:18:36 +02:00
hkernbach 5ae925f6e0 query view 2016-03-29 14:19:16 +02:00
Kaveh Vahedipour 0257162f82 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-29 14:13:12 +02:00
hkernbach dadcee6eaa removed console logs 2016-03-29 13:46:30 +02:00
hkernbach 51678757cb frontend bugfix wrong collection type 2016-03-29 13:37:31 +02:00
Kaveh Vahedipour 7959f01d4a Merge branch 'agency' of https://github.com/arangodb/arangodb into agency 2016-03-29 11:10:24 +00:00
hkernbach 06e40476f7 frontend memory issue #1717 2016-03-29 11:01:32 +02:00
Jan Steemann 4578f23226 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 19:35:50 +01:00
Jan Steemann ecf2deadb8 jslint 2016-03-24 19:35:37 +01:00
Jan Steemann 5166dc72d2 jslint 2016-03-24 19:32:31 +01:00
Jan Steemann d9c5877054 test fixes 2016-03-24 19:25:25 +01:00
Jan Steemann 07e43276c6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 18:20:37 +01:00
Kaveh Vahedipour 1f9e40fbf6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-24 17:54:13 +01:00
Kaveh Vahedipour afad06d1d0 updating tests 2016-03-24 17:54:02 +01: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
Michael Hackstein 582be9e707 Fixed usage of replace in graph-blueprints 2016-03-24 17:10:01 +01:00
Jan Steemann 881761d2d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:05:43 +01:00
Jan Steemann cda0646c83 removed unused error codes 2016-03-24 17:04:58 +01:00
Andreas Streichardt 9ba72b4412 Properly update current collection 2016-03-24 16:55:15 +01:00
Michael Hackstein 28a0fd89a8 Removed tests of removed functions BY_EXAMPLE_SKIPLIST / BY_EXAMPLE_HASH 2016-03-24 16:54:19 +01:00
Michael Hackstein 5b3f81b8d5 Fixed test that expected leftover shapes and markers. They can be removed now 2016-03-24 16:46:07 +01:00
Michael Hackstein 91c98d479d Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-24 16:43:34 +01:00
Michael Hackstein 9af0a529fa Changed expectation for error message when storing RegExp and Function. Is BAD PARAMETER now, was SHAPER_FAILED. 2016-03-24 15:57:02 +01:00
Jan Steemann cd0f717166 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 15:55:26 +01:00
Jan Steemann 688109bcc5 jslint 2016-03-24 15:55:13 +01:00
Michael Hackstein db4b6d2a5b Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-24 15:48:50 +01:00
Michael Hackstein 5b5bf7cad8 Removed tests for byConditionSkiplist. Not supported any more 2016-03-24 15:48:18 +01:00
Michael Hackstein 9371e04a63 Removed tests for CAP constraints and FIRST. Which do not exist any more. 2016-03-24 15:43:59 +01:00
Jan Steemann b9b78aa0d7 fixed test 2016-03-24 15:41:10 +01:00
Andreas Streichardt 3f9f03bb38 Remove debug 2016-03-24 14:26:12 +01:00
Michael Hackstein 0d623b58bb Reverted ordering chance in Object sort function. 2016-03-24 13:18:55 +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
Michael Hackstein 6a59de8efc Fixed ordering of elements. Internal sort on in-place created documentes behaves a little bit different now 2016-03-24 12:47:48 +01:00
Jan Steemann f161a98ba4 test fixes 2016-03-24 12:46:08 +01:00
Kaveh Vahedipour 8bc6d193c4 Remerge from devel into agency for integration into cluster 2016-03-24 11:17:59 +01:00
jsteemann 20dfe7ca9e fixed test 2016-03-24 01:50:55 +01:00
jsteemann b7c1a42f96 test fixes 2016-03-24 01:12:57 +01:00
jsteemann 72a86bccfd removed cap constraints 2016-03-23 23:48:37 +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 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Jan Steemann 7c245bd3a3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:21 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
Michael Hackstein 2d45a6e5b2 Fixed statistics for Traversals. Also uses less lookups now 2016-03-23 16:04:53 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Michael Hackstein 42b866804f Fixed test that relied on a non deterministic ordering 2016-03-23 12:45:40 +01:00
Michael Hackstein 9bd35dcb63 Fixed tests for errors in AQL Edges function. It is more relaxed for input parameters. It does not THROW but simply returns an empty array instead 2016-03-23 12:17:59 +01:00
Kaveh Vahedipour 9677db67a6 turning off lights in agency? 2016-03-23 11:44:46 +01:00
Michael Hackstein 46f4d627e6 Added some tests for Traversals in subqueries 2016-03-23 11:03:54 +01:00
Kaveh Vahedipour e3cc35ccf6 pulling into devel 2016-03-23 08:43:06 +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
Michael Hackstein 8dfaf023fc The test for EDGES now does not expect 'CollectionNotFound' if the start vertex collection does not exist. 2016-03-22 09:54:45 +01:00
Kaveh Vahedipour ccb517fac7 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-22 08:15:33 +01:00
Kaveh Vahedipour 4a86d26f19 need to find out how to define the headers properly 2016-03-21 18:23:14 +01:00
Jan Steemann 31d9c1873a fixed test 2016-03-21 18:03:49 +01:00
Jan Steemann f0724447b6 fixed sparse index test 2016-03-21 17:08:42 +01:00
Jan Steemann ecf3120190 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 13:24:17 +01:00
Jan Steemann b672ce0985 test fixes 2016-03-21 12:15:40 +01:00
Frank Celler ad5828f122 fixed shebang test 2016-03-21 12:04:05 +01:00
Kaveh Vahedipour 2583c00859 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-21 10:41:15 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
Kaveh Vahedipour eba9a26891 writing test 2016-03-21 08:42:35 +01:00
Kaveh Vahedipour 3beb3450b1 catch malformed input. 2016-03-21 08:00:54 +01:00
Frank Celler 34164794cf fixed call 2016-03-20 22:26:02 +01:00
Frank Celler d3658aefe6 fixed valgrind 2016-03-20 21:28:27 +01:00
Frank Celler b736282bbc fixed non shebang 2016-03-20 18:56:50 +01:00
Frank Celler c2451cbf02 added missing wait 2016-03-20 13:31:13 +01:00
Frank Celler e6e367c1ca fixed chmod 2016-03-19 23:21:59 +01:00
Frank Celler 6dd99abe65 flag --skipShebang 2016-03-19 20:57:21 +01:00
Frank Celler 9707129b2f fix for travis 2016-03-19 19:38:33 +01:00
Frank Celler 6fa973d87d added shebang test 2016-03-19 16:17:55 +01:00
Frank Celler 3fb8685d09 only run suites if the exists 2016-03-18 21:18:03 +01:00
jsteemann 1bd1463b4b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 20:22:25 +01:00
Frank Celler 5a1e8fd6fe Merge branch 'devel' of github.com:arangodb/arangodb into v8 2016-03-18 20:20:15 +01:00
Frank Celler e51e764fb5 added ruby locator 2016-03-18 20:18:15 +01:00
Kaveh Vahedipour 3d3fb23a62 writing test 2016-03-18 18:59:06 +01:00
Frank Celler a7361dca7f added rspec option 2016-03-18 18:33:36 +01:00
jsteemann f12320277f bugfixes 2016-03-18 16:56:05 +01:00
Frank Celler 33e2b7b844 Merge branch 'devel' of github.com:arangodb/arangodb into v8 2016-03-18 15:35:01 +01:00
jsteemann f1d395cce0 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 15:21:16 +01:00
jsteemann 5ded90ed1c fixed compare function for Custom attributes 2016-03-18 13:55:36 +01:00
Andreas Streichardt f37b8cbcf3 Disable loopfunc warnings (not helpful..decided in quorum) 2016-03-18 10:58:50 +00: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 a9b47e1608 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-18 11:09:04 +01:00
Max Neunhoeffer bf77bd31e2 Fix jslint. 2016-03-18 11:08:52 +01:00
jsteemann 82a1c58429 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 11:03:54 +01:00
Frank Celler def5b35a84 jslint fixes 2016-03-18 11:02:42 +01:00
jsteemann fd49f750fb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 10:46:03 +01:00
Frank Celler 6d19bdbbfe Merge branch 'devel' of github.com:arangodb/arangodb into v8 2016-03-18 09:50:20 +01:00
Frank Celler 970f38390b removed transaction key 2016-03-18 09:34:49 +01:00
Max Neunhoeffer 3ced50dc2a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-18 02:07:09 +01:00
Max Neunhoeffer d1c5c64d6b Fix baby methods for documents in arangosh. 2016-03-18 02:05:19 +01:00
Max Neunhoeffer 20fb42afd5 Cleanup of tests. 2016-03-18 02:04:38 +01:00
Andreas Streichardt 14ce41435b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-17 22:40:00 +00:00