1
0
Fork 0
Commit Graph

899 Commits

Author SHA1 Message Date
jsteemann 0e59b674cc execute enterprise tests again 2018-06-22 19:27:00 +02:00
Andrey Abramov 5eef6cd618
Feature/test iresearch (#5610)
* start implementing arangosearch cluster tests.

* backport: ensure view lookup is done via collectionNameResover, ensure updateProperties returns current view properties

* first attempt to fix failing tests

* refactor cluster wide view creation logic

* if view is not found in the new plan then check the old plan too

* ensure the cluster-wide view is looked up in vocbase as well on startup/recovery

* do not store cluster-wide IResearchView in vocbase

* move stale view cleanup to the shared pointer deleter, address test failures

* do not print warning

* enable arangosearch tests by default

* fix catch tests

* address icorrect return value for cluster-wide links

* address some issues with test failures due to cluster-view allocated within TRI_vocbase_t

* simplify per-cid view name, address 'catch' test failures

* ensure IResearchViewNode volatility is properly calculated in cluster

* invoke callbacks directly in AgencyMock instead of waiting for timeout

* ensure view updates via JavaScript always use the latest view definition

* pass a list of shards to `IResearchViewDBServer::snapshot`

* extend cluster aql tests

* fixes after merge

* fix class/struct inconsistencies

* comment failing tests

* remove debug logging

* add debug function

* tests cleanup

* simplify upcoming merge: pass resolver from a side

* backport: move all transaction status callback logic to Methods

* add changes missed from previous commit

* fix js and ruby tests

* more tests for IResearchViewNode

* pass transaction to IResearchViewDBServer::snapshot, address IResearchViewDBServer tests segfault

* pass transaction to IResearchView::snapshot instead of transaction state

* temporarily add trace log output to tests to try to find the cause of the core dump on Jenkins

* add more temporary debug output to trace down the segfault on Jenkins

* add even more temporary debug output to trace down the segfault on Jenkins

* ensure Vieew related maps are cleared during shutdown

* reset ClusterInfo::instance() before DatabaseFeature::unprepare()

* remove extraneous debug output

* missed line from previous commit

* uncomment required line

* add nullptr checks to RocksDBIndexFactory::prepareIndexes(...) similar to the ones in MMFilesIndexFactory::prepareIndexes(...)

* attempt to fix deadlock in tests

* add comment as per reviewer request

* fix aql test suite name

* add some debug logging

* address deadlock between ClusterInfo::loadPlan() and CollectionNameResolver::localNameLookup(...)

* eplicitly state which index definition failed in the log message

* use vocbase from shard-view isntead just in case

* explicitly state which index definition failed in the log message

* do not create shard-view instances from cluster-link instances (only register existing ones)

* add some tests
2018-06-21 20:35:04 +03:00
Jan 5ce22a3bc9
make API for POST /_api/aqlfunction downwards-compatible again (#5636) 2018-06-20 12:52:54 +02:00
Wilfried Goesgens 0470f945fa Bug fix/improve test status handling (#5591)
* add missing documentation about argument handled in unittest.js

* improve error handling on fs.write

* fix option name

* improve result handling

- add exception handling
- write status bad even before we start the test so we really know when
  something went wrong.

* SYS exceptions will already handle system exceptions

* rethrow

* only return true if the file object has no error bit set

* don't double-close on error.

* add note that we disable exceptions explicitely
2018-06-13 14:10:44 +02:00
Wilfried Goesgens da3b222ebc disable circumventing of coredumps for windows (#5583)
* disable circumventing of coredumps for windows
* this is a local variable now.
* fix argument count
2018-06-13 13:54:24 +02:00
Wilfried Goesgens 31c708ce71 merge dump suites so they can use shared code as much as possible. (#5528) 2018-06-12 13:48:04 +02:00
Jan 8e28b03efd
do not invoke catch tests twice (#5570) 2018-06-11 10:24:07 +02:00
Jan 7351423ad5
cleanup import messages, reuse StringBuffer for JSON import (#5569) 2018-06-11 09:47:26 +02:00
jsteemann 20de7f04e6 fix "scripts/unittest arangosh" 2018-06-09 13:44:01 +02:00
Heiko 743d4430bf added replication ui (#5555) 2018-06-08 11:19:05 +02:00
Wilfried Goesgens a416d12fd8 forgot to add bucket splitting (#5561) 2018-06-08 10:54:10 +02:00
Frank Celler c5ac519d1c Bug fix for Read/Write race [WIP] (#5534)
* added wrapper, added asio_ns
* Temporarily fix condition variable bug in job queue.
* preparation for 3.3 back-port
* clang-format
* removed unecessary check, this is now fixed by stand
* added missing RequestStatistics::SET_READ_END
* cosmetics
2018-06-08 10:51:54 +02:00
Kaveh Vahedipour 1671201241 Bugfix/inspector thread (#5553) 2018-06-07 16:23:10 +02:00
Kaveh Vahedipour de04250fbb typos is api acquisitions (#5543) 2018-06-07 13:42:46 +02:00
Kaveh Vahedipour 10888f33bb unpacker for inspector reports (#5546) 2018-06-07 13:41:55 +02:00
jsteemann 1832118182 fix jslint 2018-06-07 13:06:14 +02:00
Wilfried Goesgens eb9bf93c98 Feature/cleanup rspec integration (#5517) 2018-06-07 11:47:46 +02:00
Wilfried Goesgens b2777c41bd Re-Add the now optional method to automatically analyze crashes (#5435)
* Re-Add the now optional method to automatically analyze crashes

* the user or CI may now specify `--coreCheck true` if the testsuite
  should perform automatic core analysis for him.

* improve english, fix object member to address as pointed out by @dan
2018-06-06 17:32:12 +02:00
Kaveh Vahedipour 03edbf44d7 Feature/arangodoc (#5476)
* introducing arangoinspect
2018-06-05 15:38:50 +02:00
Jan 80f6574c6a
remove unused files (#5520) 2018-06-04 11:26:38 +02:00
jsteemann 3b14057480 fix tests 2018-06-01 21:43:22 +02:00
jsteemann f857e23b21 fix jslint warnings 2018-06-01 18:24:32 +02:00
Wilfried Goesgens 1172512622 Add ability to turn on line number logging to the catch tests (#5448)
- if the user has enabled extremeVerbosity on the unittest,
   line number logging will be turned on as well.
2018-06-01 18:11:33 +02:00
Wilfried Goesgens 991be0cb40 introduce target to locate the testsuite for a given testcase filename (#5482) 2018-06-01 17:23:33 +02:00
Jan d648fd0e30
fix read-only tests (#5479) 2018-05-29 13:13:51 +02:00
Jan Christoph Uhde a2dcb6cc5d WIP - start adding optional overwrite to insert operation (RepSert) (#5268) 2018-05-24 19:47:15 +02:00
Simon 17b1a2aafb Rest middleware refactoring (#5332) 2018-05-14 17:43:10 +02:00
Jan 8cd52ae95b
remove obsolete printBrowser function (#5259) 2018-05-04 11:30:39 +02:00
Alan Plum d5a93f5926 Teach executeTransaction about ArangoCollection objects (#5183)
* Teach executeTransaction about ArangoCollection objects

* Simplify logic

* Don't test with allowImplicit

* Update arango-database.js
2018-05-03 14:17:31 +02:00
Alan Plum 03eba9e8e0 Deprecate foxx-manager (#5089)
* Deprecate foxx-manager

* Use URL introduced in #5180 for foxx-cli docs
2018-05-03 14:14:37 +02:00
Simon 468231efc5 AQL Profiling code (#5165)
* initial start of profiling

* adding profiling code

* Fixing remote block tracing, fixing width and units

* Fixing some tests

* Various fixes

* adressing review comments
2018-04-24 16:17:30 +02:00
Simon 45fbed497b Supervision Job for Active Failover (#5066) 2018-04-23 12:49:41 +02:00
Simon fad4c0f9f4 Moving out more from #5066 (#5124) 2018-04-17 16:55:19 +02:00
Simon 8be273efb8 Replication cleanup (#5105) 2018-04-17 08:17:42 +02:00
Tobias Gödderz 089b21e3de fix dump&restore of smart graphs (#5093)
* fix dump&restore of smart graphs (#5093)

* Added tests for dump-restore of SmartGraphs

* Arangosh will now expose isSmart and the smartGraphAttribute on properties

* RestReplicationHandler will now ignore smart-graph collections unless you execute it with force

* Added changelog

* Reactivated original mmfiles dump/restore test

* Skip hidden smart graph collections in arangodump

* Do not dump shadowCollections metadata of smart edge collections

* Cluster optimizer rules for soerted gather nodes now handle virtual edge collections correctly

* Added a dump/restore tests for smartgraphs in rocksdb as well

* Deactivated checks for writesExecuted statistics in dump/restore tests for smartgraphs mmfiles

* Really exclude shadowCollections

* Reduced loglevel

* Added tests

* Don't change single-server behaviour

* Fix tests for omitted shadowCollections and hidden collections

* Activated statistics in MMFIles dump test again and included isEnterprise in rocksdb dump test

* A modification node can now disableStatistics, which means it does not contribute to query->extras() this is only relevant in SmartGraph case so far.

* Added a test to dump&restore satellite collections

* Bugfix: restore satellite collections properly

* Added regression test for internal issue #2237

* Fix bug #2237

* Updated CHANGELOG

* Copied dump/restore tests to rockdsb

* Removed enterprise test

* Added inline comment for smart-edge collections in optimizer rules

* Removed duplicate CHANGELOG entry

* Simplified removal of shadowCollections

* fix jslint

* Made internal.isEnterprise() available in js client context. Taken from 3.3/59f655fa

* fix broken dump_encrypted test

* Removed accidentally copied CHANGELOG entry
2018-04-16 12:28:13 +02:00
Simran 6c11452ace Doc - Add some missing db and collection methods (#4901) 2018-03-27 17:22:43 +01:00
Michael Hackstein 1e96c94aad
Windows should now use rspec.bat by default. No stunts with handed in ruby and rspec foo required but still possible. (#4937) 2018-03-23 11:40:15 +01:00
Andrey Abramov 294c36f778 use ERROR_ARANGO_DATA_SOURCE_NOT_FOUND instead of ERROR_ARANGO_COLLECTION_NOT_FOUND/ERROR_ARANGO_VIEW_NOT_FOUND in js part too 2018-03-19 13:55:25 +03:00
Jan ed843991d6
added test (#4840) 2018-03-14 16:14:09 +01:00
Simon eb709e0dd8 Using stream cursor in arangoexport and arangosh (#4807) 2018-03-12 09:41:43 +01:00
Simon 272859c5fd Replacing js upgrade logic (#4061) 2018-03-08 13:57:30 +01:00
Simon 102998dd65 Streaming Query Cursor (#4769) 2018-03-08 09:18:41 +01:00
Simon 345fc3c0b7 Refactor Authentication Layer (devel) (#4592)
* Cherry Picking LDAP changes

* Adding missing merges

* Fixing remaining mentions of FeatureCacheFeature

* Fix jslint

* Fixing some failed tests

* Fixing cluster authentication issue, red tests

* Fixing ldap testsuite, adding trace logging

* Fixint ldap tesuite setup and LDAP recognition

(cherry picked from commit 686d28a779)

* Fixing wrong assert

* Adding changelog entry, making requested changes from code review

* Fixing dump_authentication, fix typos

* improvements found during code review

* oops

* more use of sessionstorage

* fix tests

* Fixing broken handling, disallowing adding of local users when disabled

* Fixing testInvalidGrants

* Removing undefined auth level externally

* Fixing previous commit

* added tests for ldap search mode

* intentionally removed `after` methods from tests

because they are executed before the tests start
no cleanup is performed right now after the authentication tests
however, a cleanup is done at start of every test

* ldap tests all modes

* forward port changes from 3.3

* added generated files

* forward port missing changes for web UI

* added generated files

* added generated files
2018-02-28 13:24:28 +01:00
Jan 63c50c3993
Bug fix/handle single delete (#4618) 2018-02-19 14:49:58 +01:00
Wilfried Goesgens 619155a62d Feature/aqlfunction to cpp (#4573) 2018-02-13 11:50:49 +01:00
Simon 35136a89c0 Fix some problems with active failover (#4540) 2018-02-09 15:11:53 +01:00
Jan 8da61a9875
Bug fix/more replication tests (#4500) 2018-02-09 13:06:47 +01:00
Wilfried Goesgens 14c5c3aa35 fix restoring a dump created from a cluster to single server (#4350) 2018-01-24 13:50:27 +01:00
Manuel B ebf1622b4e typo (#4414) 2018-01-24 13:48:41 +01:00
Andrey Abramov a1cfb3d72b Feature iresearch (#4105) 2018-01-19 14:23:58 +01:00
Jan Christoph Uhde bddadda0ee add 'create database' to 'import feature' (#4278) 2018-01-15 15:15:31 +01:00
Jan b2b6c06cbf
Feature/efficiency (#3736) 2018-01-05 16:51:31 +01:00
Jan 6040b4ae9f
add ignore-missing option to arangoimport (#4129) 2017-12-22 11:29:10 +01:00
Jan 2a96df5ca5
Feature iresearch (#4071) 2017-12-18 15:04:59 +01:00
Jan 4ceaf2ce1c
add minPort and maxPort to testing.js help output (#4042) 2017-12-15 10:26:41 +01:00
Dan Larkin 9cd8c47eb7 Renamed arangoimp to arangoimport (with alias for compatibility.) (#4040) 2017-12-14 21:31:21 +01:00
jsteemann c14076744b remove garbage output at test start 2017-12-06 18:08:46 +01:00
Jan 08949a1608
disable junit reporter for catch tests (#3864) 2017-12-06 16:35:18 +01:00
Simon Grätzer ec80ee39fd Fulltext Index Cursor (#3807) 2017-12-06 14:29:57 +01:00
Jan f3e4e84778
add a test for replication applier restarts (#3750) 2017-12-06 11:09:36 +01:00
Frank Celler 179ae83cbc
Feature/encrypted dump (#3768) 2017-11-22 15:59:02 +01:00
m0ppers ce537af092 Broken client API and server default was wrong (#3748) 2017-11-21 17:19:14 +01:00
Simon Grätzer 0e485f7441 Fixing collection name collection handling in Syncer (#3710) 2017-11-17 16:36:57 +01:00
Jan 4a199e2fe3 make truncate a bit less obstrusive (#3721) 2017-11-16 20:28:33 +01:00
Jan 14408a46fe flush the WAL after truncate and rotate journals in order to free space (#3685) 2017-11-14 16:39:22 +01:00
Jan Christoph Uhde e13ebbb128 fix path for catch tests in process-utils.js (#3592) 2017-11-08 08:55:53 +01:00
m0ppers b552853909 Feature/optional replication factor enforcement (#3570) 2017-11-02 21:41:25 +01:00
Jan abc4c09d1e make the ArangoShell refill its collection cache (#3441) 2017-11-02 15:32:48 +01:00
Simon Grätzer d14710b683 Updating Replication Factor (#3528)
* Changing replication factor in 3.2 (#3513)

* Allow changing replicationFactor on coordinator

* Fixing logic

* Allowing change of replication factor

* Additional input validation

* grrr

* Testing invalid inputs

(cherry picked from commit 47600e1ea1)

* jslint

(cherry picked from commit 4d223597db)

* cherry-pick commits from 3.2: 47600e1ea1 4d223597db d684eaa7f8 a898af3723
2017-10-26 15:28:05 +02:00
Simon Grätzer 7c31960cf2 Feature/async failover (#3451) 2017-10-18 23:59:29 +02:00
Frank Celler bf281688ca Feature/jenkins pipeline (#3365) 2017-10-04 10:13:54 +02:00
Jan 56fab56ff5 Bug fix/issues 2709 (#3333)
* logging improvements

* fixed copy&paste error

* enable assertions in non-release mode

* updated CHANGELOG

* fix --temp.path (was dysfunctional), fix creation of temporary directories and races
2017-10-01 09:43:03 +02:00
Max Neunhoeffer 3a4cf41270 Revert "Revert "rework process handling (#3322)""
This reverts commit d2b62c99d6.
2017-09-28 15:53:19 +02:00
Max Neunhoeffer d2b62c99d6 Revert "rework process handling (#3322)"
This reverts commit c56e4949b9.
2017-09-28 15:25:05 +02:00
Wilfried Goesgens c56e4949b9 rework process handling (#3322)
- migrate the process handling to c++ where appropriate
- move code definition / usage closer together
- add function to portably detect external processes (not spawned by us) and whether we may
- send them signals
- add portable code to send signals to processes
- for linux match what impact a signal will have on the process we send it
- check the status of the process we sent the signal, and return if its non-deadly or the process terminated
- after 8 retries with 1 second sleep send a hard kill.
- killExternal() now returns the same structure as statusExternal()
- don't block signals on spawned processes
2017-09-28 13:35:54 +02:00
Max Neunhoeffer e070921bc6 Revert "shut down the second instance properly (#3332)"
This reverts commit 890cd995ef.
2017-09-27 09:22:14 +02:00
Max Neunhoeffer 78ec0ec469 Revert "Bugfix/fix test arangod shutdown command (#3260)"
This reverts commit 3afebaed42.
2017-09-27 09:18:39 +02:00
Frank Celler bc60ebcc5f fixed jslint 2017-09-26 21:28:17 +02:00
Wilfried Goesgens 890cd995ef shut down the second instance properly (#3332) 2017-09-26 18:32:37 +02:00
Wilfried Goesgens c37143b070 During the startup of arangod the client will fail to connect. (#3302)
Since we retry anyways, silence the error message for the first tries
to reduce meaningless log output of testing.js
2017-09-26 14:54:59 +02:00
Wilfried Goesgens 3afebaed42 Bugfix/fix test arangod shutdown command (#3260)
* If our arango-object claims its got a connection to the arangodb server, use it to send a shutdown signal to the server.

If not, fall back to using a download http request.

* don't use kill to shut down the server, we now can use the regular shutdown command.
2017-09-26 14:46:30 +02:00
Wilfried Goesgens 2c29822afe if we successfully deleted the directory don't re-attempt. (#3288) 2017-09-19 18:16:04 +02:00
Wilfried Goesgens adeb926065 Work around windows processes not releasing resources (#3284)
- add retry for cleanup when deleting of directory fails
- if we fail 5 times, let the final cleanup handle it.
2017-09-19 12:17:50 +02:00
Jan 0733c04101 remove art (#3282) 2017-09-19 09:55:29 +02:00
Wilfried Goesgens 2833bd6185 Bugfix/cleanup graphs (#3250)
* when running against an external server also setup the proper connection

* cleanup grahs after testing
2017-09-15 14:20:21 +02:00
Jan 5165155ed1 Bug fix/fixes 0609 (#3227)
* do not use V8 variant of AQL functions in early optimization stage when a C++ variant is available

* additionally, simplify AQL function definitions and aliases

* warn when more than 90% of max mappings are in use

* added C++ variant of replication catchup

* added `--log.role` option

* updated CHANGELOG

* removed non-existing scheduler.threads option from config

* removed useless __FILE__, __LINE__ invocations

* updated CHANGELOG

* allow a priority V8 context

* remove TRI_CORE_MEM_ZONE

* try to fix Windows errors & warnings

* cleanup

* removed memory zones altogether

* exclude system collections from collection tests
2017-09-13 16:28:21 +02:00
jsteemann f8d8a561a4 fix various issues 2017-09-13 09:03:28 +02:00
Wilfried Goesgens 9457395b80 workaround cluster not allowing to drop system collections 2017-09-13 00:02:30 +02:00
Wilfried Goesgens 5b131450a2 revalidate that tests clean up properly. 2017-09-12 14:49:06 +02:00
Wilfried Goesgens 48c5587c67 only run testsuite when we're on enterprise and actually do have tests 2017-09-12 12:11:13 +02:00
Simon Grätzer ffc465433a No access collections Improvements (#3190)
* consolidated EdgeDocumentToken

* optimizing cluster traversal

* adding skip collection checks

* API cleanup

* copying AQLValue to avoid use-after-free bugs

* Fixing rocksdb SingleServerEdgeCursor

* Fixing a collection resolving issue
2017-09-07 14:55:07 +02:00
Simon Grätzer 88d01b89b5 Optimizations for Caches and Graph Traversals (#3169) 2017-08-31 18:33:10 +02:00
Andreas Streichardt 7d2ab6055f Merge with latest changes in improve-jenkins
stashing should work better now
2017-08-31 17:53:48 +02:00
Wilfried Goesgens be8e04295d be more ignorant about existing or missing directories on startup / cleanup. 2017-08-31 15:42:37 +02:00
Jan 2f05b0ffeb jslint (#3167) 2017-08-30 11:28:51 +02:00
Wilfried Goesgens c662dfc863 Cleanup after each testrun (#3109)
* Cleanup after each testrun

 - add a success testsuite next to the fail testsuite
 - create temporary directories in the fail & success testsuites
 - add a function to cleanup the last unshifted directory
 - don't say we're crashed when exiting with the help message

* Specify temp path for SUT so its files will be removed after cleanup.

 - cleanup
 - don't use getTempFile(), it will create another subdirectory that we don't clean up afterwards...

* Fix temp path usage

 - creating a 'bundles' directory wherein we would keep our temporary bundle files would collide if we'd clean it up.
 - create 'bundles-tmpxxxx' instead so its individual to us and we can remove it when done without problems.

* properly create & pass in a temporary directory - as we now require this.

* Remove intermediate directory recursive - for some unknown reason there may be temp files created.

* we need to unify tempfilenames here too.

* use individual suite names

* use the standart performTests to run the backup tests - so we have the proper directory and server handling from the infrastructure.

* fix temporary directory handling in the recovery tests.

* script to build debugging debian packages

* Improve test shutdown

 - handle a set of options globally per testsuite, so they don't need to clone them inside.
 - properly cleanup the slave instance of the replication tests after each run.
 - The per testsuite options vector will fix the behaviour that after one failed testsuite
   all other suites won't be cleaned up anymore.

* don't call the overal cleanup if anything failed.

* fix cleaning up of directories.

* cleanup, fix directory creation / deletion / dummy creation.

* cleanup, fix directory creation / deletion / dummy creation.

* fix tempdir handling for the recovery tests
2017-08-30 10:48:24 +02:00
Simon Grätzer 885ea3dd5f Remove attribute option for arangoimp (#3141)
* Adding a remove attribute option to arangoimp (only for csv)

* Adding documentation

* Fixed log statement

* Update CHANGELOG
2017-08-30 10:45:02 +02:00
Michael Hackstein 0f1b6e32eb Bug fix/issue 3106 orphans in general graph (#3147)
* Added a test-case for #3106

* Added a fix for #3106
2017-08-28 15:02:15 +02:00
Wilfried Goesgens 2a82cf8667 when running the client tests on an already running server we have to specify the server root directory. (#3102) 2017-08-24 17:05:51 +02:00
Simon Grätzer fadafa6384 Fixing engine stats in arangosh (#3038) 2017-08-17 21:26:06 +02:00
Jan 8e4dac4fc4 fix fulltext index removal performance, simplified code (#3015)
* simplify index API a bit

* fix fulltext index removal performance, simplified code

* updated CHANGELOG

* fix hanging test

* try to fix shutdown problem

* improve fulltext query performance

* fixed duplicate var

* removed obsolete code

* fix some shutdown races

* do not call ensureIndex that often
2017-08-12 09:25:30 +02:00
Jan Christoph Uhde 0eaf4cabd9 Feature/js to cpp transaction handler (#2985)
* implement transaction handler in c++

* add fake request object

* move general code into extra file

* improve error messages for RestJobHandler

* support cancel operation for async jobs with RestTransactionHandler

* fix integration test and add some optional debugging output

* fix returning of context

* fix error type

* fix code in cluster test

* remove unused variable
2017-08-11 09:29:34 +02:00
Jan Christoph Uhde ab5f5f488d fix building with relative paths (#2979)
* fix building with relative paths

* fix locating of configuratin files
2017-08-10 09:41:15 +02:00
Michael Hackstein 7ab117f5f8 Bug fix/dump restore auth (#2917)
* Added a backup test suite. This suite is supposed to entirely drop an ArangoDB _system and restore it into a fresh one. This also includes system collections.

* Added more test cases for backup suite. Now tests several authorization/rights cenarios

* Fixed RestReplication Handlers to restore _user collections Properly.

* Updated Changelog

* Added special handling of _users in Restore for MMFiles as well.

* Added JWT secret for cluster execution of this test, also added JWT secret to shutdown call
2017-08-09 12:59:51 +02:00
Jan Christoph Uhde ae9e716423 remove debugging output (#2955) 2017-08-08 16:27:15 +02:00
Simon Grätzer 8878729f8b Adding `db._engineStats` for arangosh 2017-08-07 17:00:15 +02:00
Jan ce2425cade Bug fix/daily fixes (#2958)
* do not rely on non-existing feature "AQL"

using such feature makes the server throw two exceptions (which will be caught) on startup, but its silly for debugging

* use condition variable for signalling shutdown

* do not hard-code the log levels for recovery tests

this has taken so many developers so much of their time that it is about time to fix it

* ensure the 'unittests' script properly finds 'arangosh' and the build directory
2017-08-04 20:46:08 +02:00
Jan e6ba5713ca fixed issue #2943 (#2945) 2017-08-04 13:37:35 +02:00
Simon Grätzer 3f58a44e3b Fix cases where the root user has access to excluded collections (#2856) 2017-08-03 21:16:08 +02:00
Manuel B fe8b9b70c4 Feature/planning 580 arangoexport with query (#2882)
* added query export capability

* test for export --query

* docu

* document export with query

* Update CHANGELOG
2017-07-28 08:41:53 +02:00
Simon Grätzer f50a36181d Various authentication related issues (#2824) 2017-07-18 22:22:09 +02:00
Frank Celler ba276467c0 cloned options (#2819) 2017-07-17 17:36:24 +02:00
Frank Celler a692577f5b Feature/auth context (#2815) 2017-07-16 09:39:03 +02:00
Manuel B df7051f2cb server / client side db._parse added (#2789) 2017-07-14 14:31:51 +02:00
Jan 852f91f32c it would have told us of about a missing semicolon (#2729) 2017-07-04 17:35:42 +02:00
Manuel B 83712b7b4a Feature/authorization query cache (#2720)
* check authorization when accessing query cache
2017-07-04 08:37:14 +02:00
Jan 1d944b97a4 fix https://github.com/arangodb/planning/issues/388 (#2714)
also fix jslint issues
2017-07-03 18:41:54 +02:00
Frank Celler bbe7484521 Feature/auth context (#2704)
* added read-only users
2017-07-02 23:15:57 +02:00
Frank Celler bec7c089fb fixed path (#2710) 2017-07-02 22:50:55 +02:00
Frank Celler 16f1f5e507 changed to signal 6 (#2583) 2017-06-16 09:50:34 +02:00
Michael Hackstein 9edb884bc8 Feature/planning issue 188 (#2547)
* add warmup documentation - #188

* warn when relinking build directory

* add warmup documentation - #188

* warn when relinking build directory

* Renamed warmup to loadIndexesInMemory which is a better name for the current implementation of this feature.

* Adapted WebUI to state 'load indexes in memory' instead of 'warmup'

* Added loadIndexesInMemory documentation.

* Renamed loadIndexesInMemory => loadIndexesIntoMemory
2017-06-12 18:54:45 +02:00
jsteemann 9015e4ca7c don't print empty warnings 2017-06-01 16:47:41 +02:00
jsteemann a35f85bcc7 added proper docs for --query.fail-on-warning 2017-05-29 15:46:48 +02:00
Michael Hackstein b9d2faa7cc Added warmup function for indexes.
Squashed commit of the following:

commit bc0472d212b2efef0d7b1b8a36f2b43e8432ba86
Merge: eb47631 5f87674
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 29 09:39:31 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into feature/rocks-index-warmup

commit eb476310b0ca6165be10b37b960933886c2757f5
Merge: d725f21 32149d2
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 29 09:00:41 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into feature/rocks-index-warmup

commit d725f21f7d61f7c79ba31fc0338881e35f4d8f48
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 15:53:23 2017 +0200

    Activated collection warmup in Cluster Mode. Added a test for collection warmup (SingleServerOnly)

commit 132bf4f9565b0dcf4ec9f84e93897b482a67ce7f
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 12:46:20 2017 +0200

    Implemented client-side warmup. It can now be triggered via http and arangosh

commit 78ea449dff86118814a2f87bdb59dc16544d92b6
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 11:25:40 2017 +0200

    Fixed assertion.

commit dae80f6277dde1a52eadda506858cc36e235bd55
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 11:08:46 2017 +0200

    Improved the CuckooIndexEstimator computeEstimate function. It is now much better on collections with many different values

commit 7abf57876511ba369d7a577e1995d4575e98c7c8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 11:06:43 2017 +0200

    Edge index warmup will now first check if a document is stored and if not will insert it. Furthermore it resizes the cache with an estimate of how many documents will be most likely inserted

commit 890d8ad4cdfd155249f060fedd5c798b9531d556
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 11:04:47 2017 +0200

    Adjusted thresholds in transactional cache. Wastly increased the amount of tries to get the lock. Lowered the fill-grade boundaries

commit 60972ab7151a3acb78e1aae4149de11d0da7aceb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 10:45:38 2017 +0200

    Added new Logtpopic CACHE that should be used to log important information regarding caches, like debug ouput on evictions / resizing, or memory-pressure resizing going on

commit 2dfacb9aef6e3fde169032514baca386786d059c
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 10:44:21 2017 +0200

    Fixed an assertion in index iterator. It expected _from/_to to be cached but we modified to cache entire document

commit f05beccef65853c30eda1859a39c28ea2295bc71
Merge: 13c6abf 5c46430
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 26 07:56:58 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into feature/rocks-index-warmup

commit 13c6abfbc2ddb451a689011110411df68247435e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 24 09:52:01 2017 +0200

    Added a getExtra feature for the edgeIndex. It now returns the complete edge as extra (temporary). Modified the EdgeCache to cache token and edge document (temporary). Added a warmup Function to collections that is used to warmup the index caches on demand.
2017-05-29 09:40:58 +02:00
Alan Plum 5d017d733c Improve Foxx cluster resilience (#2479)
* Improve Foxx cluster resilience

Fixes #2083
Fixes #2384
Fixes #2408
Addresses #1892

* Port old Foxx API

* Implement single-file services

* Add console.errorStack/warnStack/infoStack helpers

* Simplify serviceInfo validation

* Extract github/upload logic into Aardvark and old FM API
* Move generator logic into Aardvark
* Move zip/js buffer logic into FM core

* Add Foxxmanager tests

* Send empty response when no README

* Disambiguate script arg format

Historically we allow passing an array of positional arguments or an arbitrary first argument.
This is surprising behaviour, so we should just always treat the value as a first argument.

* Rebuild bundle in development mode

* Nicer HTTP docs formatting

* Create Foxx HTTP docs

* Simplify service upload handling

* Remove inline swagger docs

* Implement public download route

* Consistency

* Rebuild aardvark

* Move bundle route into /_api/foxx/_local

* Rebuild Swagger API docs

* Add changes to CHANGELOG

* More docs
2017-05-16 17:41:29 +02:00
Andreas Streichardt 35600c2ca2 Make procdump optional 2017-05-16 16:18:00 +02:00
Andreas Streichardt 086f6a26c5 Add host/port 2017-05-12 14:51:49 +02:00
jsteemann 87830a62cf turn off LDAP tests by default 2017-05-11 09:56:15 +02:00
jsteemann cb189bd973 turn off LDAP tests by default in community builds 2017-05-10 23:26:12 +02:00
jsteemann 6fad62e53d add option documentation 2017-05-10 23:18:37 +02:00
Wilfried Goesgens 03e5e68993 revalidate bucket options - throw if this testcase doesn't support it. 2017-05-09 17:08:25 +02:00
Michael Hackstein e54f4b96da Fixed jslint in testsuites/rspec 2017-05-05 15:59:02 +02:00
Michael Hackstein dd4da7cbca Rspec and Export tests now honor the given --testOutput parameter. Also ssl_server and http_server do now write in different files, this lead to errors on jenkins. 2017-05-05 15:51:22 +02:00
Manuel B 9bc9d4180c ldap test: updated statusCode to 401 2017-05-04 10:46:30 +02:00
jsteemann b65b1a3717 fix helpless engine filtering 2017-05-04 01:26:51 +02:00
Wilfried Goesgens fcd07bbf24 fix failed count in all testsuites 2017-05-03 15:26:48 +02:00
Wilfried Goesgens b10f5496d6 styleguide cleanup 2017-05-03 14:03:07 +02:00
Wilfried Goesgens b698b71605 detect cluster startup crashes 2017-05-03 10:25:33 +02:00
Andreas Streichardt 6527c8ceed Revert "Unwurst results"
This reverts commit 8312c64f60.
2017-05-02 19:05:48 +02:00
Andreas Streichardt 525a9a0d4c Revert "Fail lint"
This reverts commit 59df82c975.
2017-05-02 19:05:40 +02:00
Andreas Streichardt 59df82c975 Fail lint 2017-05-02 18:26:27 +02:00
Andreas Streichardt 8312c64f60 Unwurst results 2017-05-02 18:21:16 +02:00
Wilfried Goesgens 20a7c0e6b2 remove system stackframes from ruby output; lintify 2017-04-28 10:38:31 +02:00
Andreas Streichardt 74b721481c Wait for cluster sync when creating collections 2017-04-27 17:46:41 +02:00
Wilfried Goesgens 4c82acd5e7 only print real errors to the fail file 2017-04-27 16:29:39 +02:00
jsteemann 2077b8033e fix invalid testing.js behavior 2017-04-27 15:53:57 +02:00
Jan Christoph Uhde 278fad9185 fix jslint errors 2017-04-27 08:37:49 +02:00
Jan Christoph Uhde 3261c4ca89 print executed dump/restore command in extremeVerbosity mode 2017-04-27 07:59:38 +02:00
Frank Celler 33fda9275c Merge pull request #2451 from arangodb/feature/ldap-auth
Feature/ldap auth
2017-04-26 14:12:32 +02:00
baslr 87b3aa3e55 Merge branch 'feature/ldap-auth' of github.com:arangodb/arangodb into feature/ldap-auth 2017-04-26 11:12:51 +02:00
Wilfried Goesgens 0b7e07f096 fix writing of crash summary textfile 2017-04-26 11:08:21 +02:00
Wilfried Goesgens 6abef15252 reduce lines in output 2017-04-26 11:07:20 +02:00
Wilfried Goesgens 3c23a83f4e give the system some time to write the core dumps 2017-04-26 11:06:30 +02:00
baslr f45a7f07b1 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-26 10:52:50 +02:00
Max Neunhoeffer ed13ee7973 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 10:10:06 +02:00
Max Neunhoeffer db3195e736 Port 3.1 fixes to devel, typo. 2017-04-26 10:02:41 +02:00
Andreas Streichardt dad5a1429e Add waitForSyncReplication as a _create() option 2017-04-26 09:57:40 +02:00
Wilfried Goesgens b0b919d9cc portabilize the output of the debugger hint command 2017-04-25 15:31:10 +02:00
Manuel B f524c55aa9 ldap test: missing ; 2017-04-25 15:22:52 +02:00
Manuel B e518d15978 ldap test: tripple req 2017-04-25 15:21:02 +02:00
Wilfried Goesgens 3b17d9cdbc add missing signaling of crashed state 2017-04-25 14:50:58 +02:00
Max Neunhoeffer ab56530f76 Hand out distributeShardsLike in properties in arangosh. 2017-04-25 14:49:19 +02:00
baslr 9a78fc650b Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 15:37:18 +02:00
Jan Christoph Uhde a21fc6fd7c fix engine type filtering for replication tests 2017-04-24 15:29:22 +02:00
baslr 3d9f58bb70 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 12:45:35 +02:00
Dan Larkin c8f87d0b62 Split dump test file (engine-specific values). 2017-04-20 17:12:15 -04:00
jsteemann e7abe1e7ca fixed issue #2441 2017-04-20 15:42:16 +02:00
baslr 42ad1a8480 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-19 16:08:14 +02:00
jsteemann bda09ab9bd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 08:34:57 +02:00
Wilfried Goesgens d36a91e694 fix output of result yaml, but we only want it if extreme verbosity is set. 2017-04-18 15:25:01 +02:00
baslr 9425160d6d ldaptest handle arangod not started case 2017-04-18 11:37:53 +02:00
Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
baslr 671aed927f added failing ldap test 2017-04-13 13:56:00 +02:00
baslr 949ad9a0d8 for every ldap test one result 2017-04-13 13:24:14 +02:00
baslr cfe5d1891f Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-12 20:42:18 +02:00
baslr 399ce5fb90 options fix 2017-04-12 15:30:16 +02:00
baslr 966ea503c2 first ldap tests 2017-04-12 14:00:35 +02:00
Wilfried Goesgens 6887cdbb43 lean on the ICU_DATA env that arangosh exposes. 2017-04-12 13:53:21 +02:00
Wilfried Goesgens 24fca9974d run the tests one time without reporting to debug windows issue 2017-04-12 12:58:11 +02:00
Wilfried Goesgens ccb2175904 exclude two testsuites to check whether this hinders jenkins 2017-04-12 11:15:38 +02:00
Wilfried Goesgens 839d44de80 another place where we need to know the testresult output directory 2017-04-11 17:06:52 +02:00
baslr 850097247d prepare ldap test 2017-04-11 16:05:54 +02:00
Jan Christoph Uhde 028afb782d enable logtopic development for recovery tests
if extreme verbosity is set to true
2017-04-11 15:03:13 +02:00
baslr 42c6e539da initial ldap test 2017-04-10 17:45:46 +02:00
Wilfried Goesgens ab882744d9 on windows put the catch test next to the binaries so we can find the proper dll easily 2017-04-07 16:44:45 +02:00
Jan Christoph Uhde 77da0794ce fix shell-foxx-manager-nightly-spec.js 2017-04-06 17:32:49 +02:00
Jan Christoph Uhde c58c0e533a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  fix enterprise branch detection so it doesn't trigger a full recompile
  fix detection of partial cmake configure
  fix detection of partial cmake configure
  one more place to choose the propper directory for unittest result files.
  remove debug print
  fixed issue: #2412
  fix crash
2017-04-06 17:31:47 +02:00
Jan Christoph Uhde b7bd1d9e59 fix shell-foxx-manager-nightly-spec.js 2017-04-06 17:31:21 +02:00
Wilfried Goesgens 7507f0d756 one more place to choose the propper directory for unittest result files. 2017-04-06 14:54:09 +02:00
Wilfried Goesgens bf3f68ee26 BUGFIX: when we don't start the server we mustn't try to attempt to clean up its db directories 2017-04-06 11:43:11 +02:00
Wilfried Goesgens 050d931446 Bugfix: we want the common _and_ the server tests. 2017-04-06 11:14:01 +02:00
Andreas Streichardt 61f9f92c46 exclude longrunning tests 2017-04-05 18:47:44 +02:00
jsteemann 56e946bcaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 12:32:09 +02:00
Andreas Streichardt c4af620144 Revert "Break tests again"
This reverts commit 111c3fb7cf.
2017-04-05 12:13:23 +02:00
jsteemann 163c17fc85 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 11:23:11 +02:00
Andreas Streichardt 111c3fb7cf Break tests again 2017-04-05 10:48:53 +02:00
jsteemann 745af96786 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 10:43:35 +02:00
Andreas Streichardt caaecfda4e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-05 10:21:54 +02:00
Andreas Streichardt b8faee4415 fix replication setup 2017-04-05 10:18:56 +02:00
Wilfried Goesgens d1a6add6ab move replication & js http api tests into more intuitive locations 2017-04-05 09:48:07 +02:00
jsteemann 8d0f13b059 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 08:33:32 +02:00
Andreas Streichardt 7400f7f339 fix shutdown of replication tests 2017-04-04 17:09:21 +02:00
Jan Christoph Uhde 3c4bdc106c Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
* 'devel' of https://github.com/arangodb/arangodb:
  Cluster: expose body as V8 buffer in asyncRequest
  Cluster: expose getFoxxmaster in V8
  make rspec backtrace more compact
2017-04-04 10:51:07 +02:00
Wilfried Goesgens 57973aa27d make rspec backtrace more compact 2017-04-03 19:37:37 +02:00
jsteemann ad3f1074fe Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 17:26:39 +02:00
Wilfried Goesgens a7a70b20cf remove old unused foxxqueues testsuite 2017-04-03 14:55:41 +02:00
jsteemann 0fcfb4f64d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 12:53:06 +02:00
Wilfried Goesgens b117a82382 fix filter for replication testcases 2017-04-03 11:58:52 +02:00
jsteemann 30311ee578 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 10:16:26 +02:00
Wilfried Goesgens b509466d39 lower timeout 2017-03-31 10:09:27 +02:00
jsteemann fdd5b3036d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 09:34:06 +02:00
Jan Christoph Uhde 95007fe28e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result
* 'engine-api' of https://github.com/arangodb/arangodb: (46 commits)
  Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
  fix handling of externals
  fix toArray()
  fix returning documents
  Added hash-, skip list, persistent indexes
  harmonize filtering - filter on full filename.
  mini modifications
  standardize starting of servers for replication tests
  Edge index compliant with design doc
  another fix for #2404
  Moved „removeLargeRange“ method to commons
  Added length byte to IndexValue keys.
  fixed issue #2404
  Added drop to primary index
  Added drop() to indexes
  Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
  Fixed edge index
  Expand on CORS documentation
  Let ArangoDB handle the allow-credentials header
  make the authentication tests run on directories
  ...
2017-03-30 19:46:17 +02:00
Wilfried Goesgens c29fcc9e07 fix testcase filtering - some other filters have to overrule it. 2017-03-30 18:06:31 +02:00
Dan Larkin 5dcf265899 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-30 12:05:07 -04:00
Dan Larkin 42807f17fb Added partialUpdate flag for view property modification. 2017-03-30 12:04:58 -04:00
Wilfried Goesgens a2a2d61cbd add bucket support to the rspec tests 2017-03-30 17:58:31 +02:00
Wilfried Goesgens 7d7deb8584 if the server timeoutes during test execution, abort testruns and instantly kill it hard 2017-03-30 17:37:38 +02:00
Wilfried Goesgens e23560a399 harmonize filtering - filter on full filename. 2017-03-30 15:50:25 +02:00
Wilfried Goesgens 3297844f8d standardize starting of servers for replication tests 2017-03-30 15:46:14 +02:00
Jan Christoph Uhde 329af8fa62 print more when using extremeVerbosity 2017-03-30 14:59:46 +02:00
Wilfried Goesgens 302307e285 make the authentication tests run on directories 2017-03-30 13:07:28 +02:00
jsteemann b2c9a976b3 re-enable AQL tests 2017-03-30 09:00:21 +02:00
mpv1989 e763233ca7 Foxx: Fix arangoUser not being set correctly 2017-03-29 17:33:16 +02:00
jsteemann 02aca574f4 turn off ranges test by default 2017-03-29 11:20:12 +02:00
jsteemann d0766688f3 properly tag geo index tests, and include the long running geo index tests by default 2017-03-29 00:54:24 +02:00
Wilfried Goesgens ffc3d6a515 - move runInArangosh over to test-utils, so its right next to runThere.
- use runInArangosh for the replication tests, so they show proper result reports.
2017-03-28 19:05:00 +02:00
Wilfried Goesgens 476befc9d0 refactor testing.js
- split utility functionality into its own file
 - add module loader so we can have modules
 - move all testsuites into own files
 - remove complicated testcase joining / splitting methods
2017-03-28 16:29:51 +02:00
Andreas Streichardt f32256e5a7 Normalize test resultstructure (hopefully) 2017-03-28 14:15:08 +02:00
jsteemann a5013733a2 force recovery tests to fail when not compiled with failure-tests 2017-03-28 09:47:52 +02:00
jsteemann a684bd6152 fix recovery tests 2017-03-28 09:34:59 +02:00
Wilfried Goesgens 6940aa6ec1 alias boost to catch 2017-03-27 19:44:06 +02:00
Wilfried Goesgens eb4c2ed8e4 fix arangosh test 2017-03-27 19:42:24 +02:00
Wilfried Goesgens e9a661e470 start splitting testing.js into handy bits. 2017-03-27 19:10:03 +02:00
Wilfried Goesgens f09ee72d65 start splitting testing.js into handy bits. 2017-03-27 19:00:21 +02:00
Wilfried Goesgens 4d0778a825 start splitting testing.js into handy bits. 2017-03-27 18:57:05 +02:00
Wilfried Goesgens 81889bfc54 Work on testingjs to make it fit for storage engine and others:
- add storage engine switch:
  - filter for files with `-rocksdb` or `-mmfiles` depending on the used storage engine.
- fix missing color reset on error messages
- make --test a substring match instead of a full match.
- print an error message if --test did not match any testcase and thus no tests were run
- disable crash check for the recovery testcases that are actually intended to crash so we can recover from the failed state
- scan for recovery testcases instead of keeping a hand written list
- make test-scan function public
2017-03-24 16:17:36 +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
jsteemann fbb14ceffc added db._engine() 2017-03-22 11:19:31 +01:00
Dan Larkin 7b690408c8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-21 12:21:10 -04:00
Wilfried Goesgens 388424bbdc engage debugger when calling general binaries that segfault 2017-03-21 16:49:20 +01:00
Dan Larkin 85132e0eaf Finished adding view support to ArangoShell. 2017-03-21 11:40:14 -04:00
Dan Larkin a80ed16477 Added basic views support to ArangoShell. 2017-03-18 16:35:51 -04:00
jsteemann 2cda79ec0b add some debug output for replication tests 2017-03-17 13:02:15 +01:00
Wilfried Goesgens e4fbbcd0eb migrate wording boost->catch 2017-03-16 17:18:28 +01:00
Wilfried Goesgens 54c62a59a9 try to get stacktraces on mac 2017-03-16 16:04:24 +01:00
Wilfried Goesgens 968ad1f82a try to get stacktraces on mac 2017-03-16 15:01:30 +01:00
Wilfried Goesgens ae50e4ca1c try to get stacktraces on mac 2017-03-16 14:56:55 +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