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

5412 Commits

Author SHA1 Message Date
Michael Hackstein 50cb7b8a84 The rocksdb cluster dump now tests Fulltext index as well 2017-05-08 12:39:00 +02:00
Kaveh Vahedipour d149baa317 ttls are considered, when key-value store read is invoced 2017-05-08 12:22:14 +02:00
jsteemann c7c5800463 attempt to fix Windows test 2017-05-08 09:53:23 +02:00
Simon Grätzer e2e64421f2 Fixed dump test 2017-05-06 02:45:20 +02:00
Simon Grätzer 59a514bb89 Count fix & tests enabled 2017-05-06 01:57:09 +02:00
Wilfried Goesgens 922f59148b lint. 2017-05-05 14:14:39 +02:00
Wilfried Goesgens ed71952418 migrate away from expect.js to chai.expect 2017-05-05 13:38:39 +02:00
Dan Larkin d77efe38dc Added explicit WAL file lifecycle management to reduce space overhead from replication. 2017-05-04 15:16:24 -04:00
jsteemann 0cad04bdb3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-04 15:09:39 +02:00
Simon Grätzer 9837fe3bb7 Added compaction after truncate 2017-05-04 14:00:21 +02:00
jsteemann 134b4f80ae do not care about collection attributes that are not used in an engine 2017-05-04 13:11:21 +02:00
jsteemann ab8a4ec176 disable test for now because actual test behavior is incorrect 
waiting for @mop to fix it
 2017-05-04 13:10:21 +02:00
jsteemann 660dc39b29 fix potentially hanging dfdb 2017-05-04 10:39:47 +02:00
jsteemann ff30754d50 disable dfdb in RocksDB 2017-05-04 01:15:02 +02:00
Simon Grätzer d23fbdc21e Fixing devel test 2017-05-03 16:56:57 +02:00
Simon Grätzer a2e2c00d62 fillIndex non transactional + tests 2017-05-03 16:07:29 +02:00
Max Neunhoeffer ce2f59c12c Avoid log spam. 2017-05-02 15:02:48 +02:00
Michael Hackstein 4fa2ef485d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-02 13:19:25 +02:00
Michael Hackstein bedf5e9245 Reactivated client-side filtering of unnecessary markers 2017-05-02 13:19:06 +02:00
jsteemann 8a9dd4e35a move engine-specific test into engine test 2017-05-02 11:24:01 +02:00
Michael Hackstein 3a19370978 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-02 10:43:55 +02:00
Michael Hackstein 5a8e8338cf Revert "Ignore collection markers in logger-follow output for syncCollectionFinalize." 
This reverts commit cf8b75db87.
 2017-05-02 10:43:39 +02:00
jsteemann 6c427c713b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-02 10:29:44 +02:00
jsteemann 3a0926ba6a make replication test more deterministic 2017-05-02 10:29:29 +02:00
Max Neunhoeffer cf8b75db87 Ignore collection markers in logger-follow output for syncCollectionFinalize. 2017-05-02 10:11:12 +02:00
Dan Larkin b86c9c239b Adjusted timing constant in async test. 2017-04-28 17:32:59 -04:00
Dan Larkin e6611ddc4f Fixed ongoing replication bugs and split the test. 2017-04-28 16:01:29 -04:00
Michael Hackstein 3b364897a1 Made replication-static test aware of MMFiles and gnore their options. 2017-04-28 17:40:13 +02:00
jsteemann 68bc8f46d8 make tests more robust 2017-04-28 16:26:36 +02:00
jsteemann a2db9ad886 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 14:28:54 +02:00
Michael Hackstein 3b3b3e9f52 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-28 14:25:43 +02:00
Michael Hackstein 9ec440d0c2 Moved tests for indexBuckets to MMFilesEngine only in dump_authentication. Not needed in RocksDB 2017-04-28 14:25:35 +02:00
Jan Christoph Uhde d76e85efea be more verbose in test 2017-04-28 14:23:16 +02:00
jsteemann a52a0f0a47 try to fix non-deterministic behavior in test 2017-04-28 13:13:30 +02:00
Andreas Streichardt 9ad98ad8d3 ahhh jslint 2017-04-27 17:16:52 +02:00
Andreas Streichardt ed98832f65 Add test to check waitForSyncReplication 2017-04-27 17:00:21 +02:00
Andreas Streichardt c47505d514 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-27 15:59:11 +02:00
jsteemann 3b48b6bd51 update safeResumeTick as well 2017-04-27 14:47:22 +02:00
mpv1989 75afe8e6ad Split tests to fix mac 2017-04-27 11:02:41 +02:00
jsteemann 8c52ccf6cf add experimental and undocumented flush option for fs.write 2017-04-26 14:52:42 +02:00
Frank Celler 34fb4768b5 Merge pull request #2401 from de3/devel 
Fix result value from queue worker
 2017-04-26 14:03:33 +02:00
Max Neunhoeffer 96615132e4 Port 3.1 fixes to devel, new test. 2017-04-26 10:19:05 +02:00
Max Neunhoeffer b6df2002e6 Port 3.1 fixes to devel, update tests. 2017-04-26 10:13:35 +02:00
Michael Hackstein e6aa022962 Fixed dump tests in cluster. MMFiles is working RocksDB gets into undefined state somewhere. 2017-04-26 09:36:01 +02:00
Dan Larkin 9dd275b497 Fixed dump/restore tests. 2017-04-25 13:54:56 -04:00
jsteemann 5209312f5d remove unused method call 2017-04-25 11:28:31 +02:00
Dan Larkin 107e6ab39d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-24 22:27:23 -04:00
Dan Larkin d1933486da Removed non-applicable test case. 2017-04-24 22:26:58 -04:00
jsteemann 4300c77d3e fixes for non-array IN lookups, added tests 2017-04-25 01:47:07 +02:00
jsteemann 4d6c21f3c5 fixed issue #2450 2017-04-24 23:06:45 +02:00
Simon Grätzer 91fe0f01ea formatting 2017-04-24 15:55:21 +02:00
Jan Christoph Uhde 64ccf864a4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Adapted statistics in tests for SinlgeServer Traversal.
  Fixed JSLint
 2017-04-24 15:01:26 +02:00
Jan Christoph Uhde dd3253a935 remove mmfiles specific test code for other engines 2017-04-24 15:00:21 +02:00
Michael Hackstein 54c857ed74 Adapted statistics in tests for SinlgeServer Traversal. 2017-04-24 13:22:42 +02:00
Michael Hackstein 6eab0b4f20 Fixed JSLint 2017-04-24 13:07:52 +02:00
Michael Hackstein 1d52eb8afe Adapted cluster-hash-index tests for RocksDB. 2017-04-24 12:45:21 +02:00
Michael Hackstein 851f772dc1 Fixed some counting/reporting for AQL statistics in Traverser. 2017-04-24 10:42:40 +02:00
jsteemann 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +02:00
Kaveh Vahedipour d5a8269d57 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-21 15:47:09 +02:00
Kaveh Vahedipour 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann dbe5aec4aa Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:31:13 +02:00
jsteemann efefb87d70 jslint 2017-04-21 15:30:53 +02:00
jsteemann 03585460a8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:28:45 +02:00
Wilfried Goesgens 3a1e65d53f add test whether append to NULL works 2017-04-21 15:23:54 +02:00
jsteemann 691dac7a73 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 12:35:07 +02:00
Michael Hackstein e3beaaa8fc Added a test + fix for a Stackoverflow issue in Traversals and ShortestPath in AQL. This occured in the case where there are a lot of starting vertices in a row that do not have any paths attached to them. Fixes: #2445 2017-04-21 11:31:30 +02:00
Dan Larkin c8f87d0b62 Split dump test file (engine-specific values). 2017-04-20 17:12:15 -04:00
Michael Hackstein 9d621d1ffd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 18:08:53 +02:00
jsteemann 296342b892 renamed a few tests 2017-04-20 17:21:34 +02:00
Michael Hackstein aed9a528fc Added WITH collection to ShortestPath-Tests 2017-04-20 17:18:46 +02:00
Michael Hackstein 3dc03d01b2 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 16:35:34 +02:00
Michael Hackstein 4e54c7365b Adapted SHORTEST_PATH unittest to include WITH statements 2017-04-20 15:58:28 +02:00
jsteemann 60d39f4650 replication bugfixes 2017-04-20 15:20:22 +02:00
Simon Grätzer 95e8e2c5ea Jslint 2017-04-19 18:24:57 +02:00
Jan Christoph Uhde ddbfed8b34 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  formatting
  updated CHANGELOG
  fix shutdown issue, modernize thread creation a bit
  fixed memory allocation which resulted in an out of bounds read
  Fixing more all tests
  Initial partial implementation of replication contexts.
 2017-04-19 17:27:36 +02:00
Jan Christoph Uhde 9736fe4b3f fix shell_server test - transactional insert/remove is slow for rocksdb 2017-04-19 17:26:50 +02:00
Simon Grätzer 97ffce3289 Fixing more all tests 2017-04-19 15:13:27 +02:00
Simon Grätzer ed46587d83 Fixed tests 2017-04-19 14:19:00 +02:00
Simon Grätzer 4b238df049 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	js/server/tests/aql/aql-optimizer-collect-methods.js
 2017-04-19 14:09:09 +02:00
Simon Grätzer 68386c3e73 Fixing tests 2017-04-19 14:08:18 +02:00
jsteemann ffabf3f78b jslint 2017-04-19 13:04:32 +02:00
jsteemann a0e9d3b67d renamed engine-specific test files 2017-04-19 13:00:34 +02:00
Simon Grätzer 51ad68746a Fixed collect methods 2017-04-19 11:29:40 +02:00
Simon Grätzer 78f890302a Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 10:48:43 +02:00
Simon Grätzer 578d229362 Fixed aql-hash test 2017-04-19 10:48:35 +02:00
jsteemann e9f9f155e2 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 10:20:16 +02:00
Simon Grätzer dd7dd54ad1 Fixing aql query index optimizer 2017-04-19 10:16:19 +02:00
jsteemann 3389337f3a Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 09:02:58 +02:00
jsteemann d35fc8fc6a added test 2017-04-19 09:02:25 +02:00
jsteemann 5817b1b911 added test 2017-04-19 08:52:58 +02:00
Simon Grätzer a90b68e6ef Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 23:11:36 +02:00
jsteemann ac58b181bd fix recovery test for mmfiles engine 2017-04-18 22:20:18 +02:00
jsteemann 24b00a0744 unify test for engines 2017-04-18 22:01:24 +02:00
Simon Grätzer 26530d149a Fixed awl-queries-array 2017-04-18 18:40:29 +02:00
Simon Grätzer 73f8c970ef Fixing shell-transaction 2017-04-18 17:26:37 +02:00
Simon Grätzer c31d4c1590 Fixed iterator 2017-04-18 17:17:28 +02:00
Simon Grätzer 01e27b803f Starting AQL tests 2017-04-18 15:14:35 +02:00
Simon Grätzer a389dc0a92 Fixing geo + full text tests 2017-04-18 13:32:44 +02:00
Simon Grätzer bab71f6339 Fixing jslint errors 2017-04-18 12:15:26 +02:00
jsteemann 2cf48d1709 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 11:33:16 +02:00
Michael Hackstein 57fbf418f0 Fixed scannedIndex values in traverser tests. It did not report the correct number of lookups required after modification for new Storage-Engine 2017-04-18 10:40:35 +02:00
Simon Grätzer e0e00b0b6b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEdgeIndex.cpp
 2017-04-13 17:48:52 +02:00
Simon Grätzer 866d8b7451 Fixing tests 2017-04-13 17:45:16 +02:00
Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
Simon Grätzer 3dc603ad1a Fixing last two recovery tests 2017-04-13 10:45:52 +02:00
Simon Grätzer 7610e0303b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	js/server/tests/recovery/create-collections.js
 2017-04-11 13:42:15 +02:00
Simon Grätzer e418bfca26 Fixing create collections 2017-04-11 13:41:05 +02:00
Jan Christoph Uhde 44bc73266a fix test 2017-04-11 13:35:19 +02:00
Kaveh Vahedipour 001c2b4092 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-11 11:46:40 +02:00
Kaveh Vahedipour 28fbf8ec12 sensitivityEstimates do not belong in Current 2017-04-11 11:46:20 +02:00
Simon Grätzer e2813114ea Merge conflict 2017-04-08 10:59:04 +02:00
Jan Christoph Uhde 56987e1ddd fix recovery tests 2017-04-07 16:52:51 +02:00
Max Neunhoeffer 53b3a73486 Add a timeout option to <collection>.drop(). 
This is in particular used to allow the Schmutz to make progress
in the case of a long running transaction.
 2017-04-07 15:52:19 +02:00
Jan Christoph Uhde 4fe6906463 fix recovery tests 2017-04-07 15:38:23 +02:00
Simon Grätzer 3a0f31dcf6 Fixing more recovery tests 2017-04-07 12:31:00 +02:00
Simon Grätzer fa199f2239 Moved more tests 2017-04-07 11:56:23 +02:00
Simon Grätzer f0eec23f1e Fixing tests 2017-04-07 11:38:42 +02:00
Simon Grätzer 42a79ed1ac Fixing counter WAL parsing 2017-04-07 11:26:52 +02:00
jsteemann e42813dafb split some tests 2017-04-06 14:28:38 +02:00
jsteemann 049d633a24 fixed tests 2017-04-06 14:22:31 +02:00
jsteemann 6308615825 renamed test file 2017-04-06 11:21:17 +02:00
Dan Larkin 1d9366b1f1 Moved/split more tests. 2017-04-05 16:09:46 -04:00
Simon Grätzer 19f220726e Fixed dump setup 2017-04-05 17:43:38 +02:00
jsteemann ff38a5023f re-add index 2017-04-05 12:31:37 +02:00
jsteemann 78302d1766 make versionFilename() a property of the engine 2017-04-04 17:23:02 +02:00
jsteemann 949985dff1 report a path, make it restartable 2017-04-04 12:03:29 +02:00
jsteemann 8206afa0b1 re-enable index 2017-04-04 11:47:34 +02:00
Edi 32b150f7b1 add comment on update code 2017-04-04 11:01:22 +07:00
jsteemann d563eb432f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-30 15:50:53 +02:00
jsteemann ddb83c8075 fixed issue #2404 2017-03-30 14:18:38 +02:00
Alan Plum 373eade2f9
Let ArangoDB handle the allow-credentials header 2017-03-30 13:08:37 +02:00
jsteemann 3ff4f15a19 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:55 +02:00
mpv1989 59e000b743 Foxx: Fix CORS blowing up when headers are not set 2017-03-29 13:43:06 +02:00
jsteemann dcfd60f98c disable skiplist index for now 2017-03-29 12:37:44 +02:00
jsteemann f728fcdbb8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 02:41:00 +02:00
mpv1989 43cb5fc81b Merge branch 'feature/cors' into devel 2017-03-28 20:37:30 +02:00
mpv1989 f3ebf247b0 automatically add CORS response headers 2017-03-28 19:48:46 +02:00
jsteemann 40e4bba260 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 14:03:53 +02:00
jsteemann 467307fd07 fixed issue #2400 2017-03-28 13:58:49 +02:00
jsteemann 888fd67ee6 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 12:09:04 +02:00
Jan Christoph Uhde b5e760b1d3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  move engine sources into their own cmake files
  Fixed exception because of hash index
  Fixed feature start order
  fix recovery test
  Edge index fixes
  remove alignas
  fix recovery test
  force recovery tests to fail when not compiled with failure-tests
  implement SLEEP() in C++
  remove useless and harmful adjustment (lowering) of file descriptors limit
  Windows: fix namespaces
  fix recovery tests
  slightly adjusted index creation
  Removed some alignas directives.
  alias boost to catch
  fix arangosh test
  start splitting testing.js into handy bits.
  start splitting testing.js into handy bits.
  start splitting testing.js into handy bits.
 2017-03-28 12:01:24 +02:00
jsteemann bc7e7da9df dont create index for rocksdb only 2017-03-28 11:56:31 +02:00
Jan Christoph Uhde 155f131031 Avoid usage of hash index 2017-03-28 11:56:00 +02:00
Simon Grätzer 4174183ffa Fixed exception because of hash index 2017-03-28 11:29:52 +02:00
jsteemann cedee8ed02 fix recovery test 2017-03-28 10:46:56 +02:00
jsteemann 17c1a6db05 fix recovery test 2017-03-28 10:04:39 +02:00
Edi f88a0e9b1e Fix result value from queue worker 2017-03-28 08:05:06 +07:00
jsteemann dab48de61b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-27 11:16:05 +02:00
Wilfried Goesgens f67ddb7bab split testcase to work around macos instabilities 2017-03-24 16:22:10 +01:00
jsteemann 7794350018 remove debug output 2017-03-24 14:18:00 +01:00
jsteemann a34a10f719 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-24 12:27:09 +01:00
Simon Grätzer fbbc118160 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-24 11:04:38 +01:00
Simon Grätzer 39b2e349dd Pregel: Coverty Scan fixes 2017-03-24 11:04:15 +01:00
jsteemann dd86a50ca5 fix misleading init messages 2017-03-24 09:49:57 +01:00
Max Neunhoeffer 07216bb4e3 Add test for COLLECT bug. 2017-03-23 13:35:57 +01:00
jsteemann 5d82e260ff added test for issue #2392 2017-03-23 12:25:42 +01:00
Wilfried Goesgens 85f58b9a21 we may now also do 'milestone'-releases next to devel/alpha/beta/rc 2017-03-22 11:59:25 +01:00
Wilfried Goesgens 8287c7a444 more debug logging 2017-03-21 18:25:13 +01:00
jsteemann c66b05afc0 hard-code v8 version number so it works 2017-03-17 17:23:55 +01:00
jsteemann 2cda79ec0b add some debug output for replication tests 2017-03-17 13:02:15 +01:00
jsteemann b3ca6edb7c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 12:15:34 +01:00
Wilfried Goesgens 5654c5cd68 add log messages so we can find out where this locks up now and then 2017-03-17 11:55:03 +01:00
jsteemann 25a380f77c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 12:50:11 +01:00
Max Neunhoeffer 4017bfb296 Revise /_api/cluster/endpoints API and Documentation. 2017-03-16 11:33:46 +01:00
Simon Grätzer 215937a884 Fixing cppcheck and jslint warnings 2017-03-16 11:20:35 +01:00
Simon Grätzer f2c133d5f6 Fix pregel test 2017-03-16 10:52:02 +01:00
Alan Plum 50e0eb16d2
Use COLOR_OUTPUT to determine whether to use color 2017-03-15 20:44:03 +01:00
Alan Plum 4920ef8b41
Implement tap/xunit reporters in Foxx 2017-03-15 20:09:31 +01:00
Alan Plum c919cb7be8
Add Foxx res.type helper 2017-03-15 20:09:27 +01:00
Simon Grätzer f22aec113f Fix typo in summary.md, fix segmentation fault, fix test 2017-03-15 17:47:33 +01:00
Simon Grätzer ad268697e3 Fix some stuff 2017-03-15 16:22:10 +01:00
Simon Grätzer d909c415aa Fixing jslint in pretzel 2017-03-15 16:14:13 +01:00
Simon Grätzer 1c5c616875 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-15 14:12:18 +01:00
jsteemann 9a88c8c226 fix a memleak 2017-03-15 14:05:13 +01:00
Max Neunhoeffer c8a205b1aa New /_api/cluster/endpoints. 
Also fix documentation (and deprecate) /_api/endpoint.
 2017-03-15 13:33:50 +01:00
Simon Grätzer f1851375da Fixed sleep time 2017-03-14 16:50:09 +01:00
jsteemann 1a06f1e15e initial functionality for views - unstable 2017-03-14 16:35:45 +01:00
Simon Grätzer 76b3487ab2 Renamed pregel test 2017-03-14 11:12:04 +01:00
Simon Grätzer a326aa2ffb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-09 14:38:50 +01:00
jsteemann 9278149b24 fixed --convert 2017-03-09 14:29:23 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
jsteemann 3ed19e291d added "shardIds" option for AQL queries to restrict queries to specific shards 2017-03-08 15:07:10 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
Simon Grätzer 0b64bf3bc2 Fixed pregel test, async default off 2017-03-07 10:41:03 +01:00
jsteemann 40abf7c1e2 fix test 2017-03-06 17:47:12 +01:00
jsteemann 965a9547cc fix test 2017-03-06 17:46:38 +01:00
jsteemann e495b5fb6c jslint && cppcheck 2017-03-06 16:13:04 +01:00
Simon Grätzer c0a390aefe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-06 15:53:43 +01:00
Simon Grätzer 5b1cb0ec6d Various fixes 2017-03-06 15:41:27 +01:00
Michael Hackstein 048bdf4cbd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 13:28:07 +01:00
jsteemann 7640586bd9 added test case for duplicate collections 2017-03-06 13:07:04 +01:00
Michael Hackstein b26ea6c3bd Added a recovery test for duplicate-name creation. This was broken during Engine-API build. 2017-03-06 10:41:21 +01:00
Frank Celler ab49f6c1b4 fixed variables parsing in GraphQL 2017-03-05 23:31:38 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
 2017-03-04 02:08:27 +01:00
Simon Grätzer e94cb25c92 Editing documentation and moving test 2017-03-03 23:29:23 +01:00
jsteemann 573c346fa5 attempt to fix issues reported by @ewoutp 2017-03-03 14:47:21 +01:00
jsteemann 356020a3c6 try to make test more deterministic, by not relying on a wait time of 5 seconds 2017-03-03 12:35:12 +01:00
jsteemann d369c698b5 fixed issue #2346 2017-03-03 10:10:38 +01:00
jsteemann 7051f5d87a fixed --convert false in arangoimp 2017-03-02 15:05:06 +01:00
jsteemann 14d5898fc2 test for issue #2342 2017-03-02 13:53:17 +01:00