Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: arangod/VocBase/document-collection.c arangosh/CMakeLists.txt js/apps/system/aardvark/test/karma/karma.conf.js		2014-02-18 08:50:27 +01:00
..
bootstrap	mount default apps in /system	2014-01-28 14:34:49 +01:00
modules/org	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00
tests	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00
arango-dfdb.js	removed unused variables	2013-11-18 11:22:09 +01:00
server.js	…
version-check.js	Reactivate some stuff for coordinator, not yet actually called.	2014-02-17 16:31:13 +01:00