Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: utils/Makefile.files		2014-01-10 17:41:52 +01:00
..
ArangoServer.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-10 17:41:52 +01:00
ArangoServer.h	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2013-12-11 18:39:10 +01:00
VocbaseContext.cpp	re-added cache for HTTP authentication data	2013-09-26 11:26:34 +02:00
VocbaseContext.h	changed reference counting for cursors	2013-09-16 13:51:33 +02:00
arango.cpp	added service functions	2013-12-22 00:48:31 +01:00