7 Commits

Author	SHA1	Message	Date
Jan Steemann	c16ddedc83	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/V8Server/v8-vocbase.cpp js/apps/system/aardvark/frontend/js/bootstrap/errors.js js/common/bootstrap/errors.js js/server/modules/org/arangodb/ahuacatl.js js/server/modules/org/arangodb/aql-helper.js js/server/tests/shell-skiplist-index.js	2014-09-09 22:18:52 +02:00
Alan Plum	606da1e3e8	Removed jslint headers from server/client/common modules.	2014-09-02 22:14:56 +02:00
Max Neunhoeffer	8549e97e6c	Adjust test to new non-sparse skiplists.	2014-08-30 00:33:15 +02:00
Jan Steemann	629348d696	properly acquire shape write locks	2014-02-28 18:43:09 +01:00
Jan Steemann	8fe19fa897	fixed index tests	2014-02-25 11:55:39 +01:00
Jan Steemann	4a99cde395	jslintified several tests	2014-02-01 01:50:58 +01:00
Jan Steemann	44b3237882	moved server-only tests to js/server/tests ... this hopefully removes some future confusion about the tests also moved some graph stuff into js/common as client-side graphs did not fully work make logfile path accessible	2013-12-04 22:05:00 +01:00