Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: CHANGELOG js/apps/system/aardvark/frontend/css/collectionsView.css js/apps/system/aardvark/frontend/css/layout.css js/apps/system/aardvark/frontend/js/routers/router.js		2014-01-30 19:40:21 +01:00
..
Basics	Implement replace and update on cluster.	2014-01-28 16:49:44 +01:00
Geo	cleanup	2013-11-16 17:12:17 +01:00
HttpInterface	fixed segfault in import API	2014-01-27 16:12:39 +01:00
CMakeLists.txt	commented out tests	2014-01-15 22:58:03 +01:00
Makefile.unittests	start up the HTTP server when starting ArangoDB in console mode	2014-01-27 09:45:26 +01:00
import-1.csv	…
import-1.json	…
import-1.tsv	…
import-2.csv	…
import-2.json	…
import-2.tsv	…
import-3.json	backport of issue #300	2012-12-22 03:38:29 +01:00
import-4.json	backport of issue #300	2012-12-22 03:38:29 +01:00
import-edges.json	issue #426	2013-02-22 23:26:52 +01:00
server.pem	…