Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: arangosh/V8Client/arangosh.cpp		2014-02-26 21:34:34 +01:00
..
bootstrap	mount default apps in /system	2014-01-28 14:34:49 +01:00
modules/org	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-26 21:34:34 +01:00
tests	Rename non-cluster tests.	2014-02-26 14:38:55 +01:00
arango-dfdb.js	removed unused variables	2013-11-18 11:22:09 +01:00
server.js	added periodic tasks and statistics historian	2014-02-20 20:29:55 +01:00
version-check.js	Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding	2014-02-20 21:02:07 +01:00