Frank Celler f22f1525d2 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding ... Conflicts: etc/relative/arangod.conf		2014-02-28 12:03:11 +01:00
..
ArangoServer.cpp	added config for server state	2014-02-28 12:02:21 +01:00
ArangoServer.h	added config for server state	2014-02-28 12:02:21 +01:00
ConsoleThread.cpp	fixed rethrow	2014-02-17 16:54:03 +01:00
ConsoleThread.h	try to force abort	2014-02-13 12:06:52 +01:00
VocbaseContext.cpp	fixed cluster authentication	2014-02-27 17:45:03 +01:00
VocbaseContext.h	cluster-internal authentication	2014-02-26 12:01:41 +01:00
arango.cpp	call global instance destructor	2014-02-02 09:23:04 +01:00