Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/arangod/RestServer
History
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
 		2014-02-06 13:18:52 +01:00
..
ArangoServer.cpp Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 13:18:52 +01:00
ArangoServer.h Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 13:18:52 +01:00
ConsoleThread.cpp windows fixes 2014-01-27 17:46:15 +01:00
ConsoleThread.h windows fixes 2014-01-27 17:46:15 +01:00
VocbaseContext.cpp added option `--server.disable-authentication-unix-sockets` 2014-02-02 00:22:07 +01:00
VocbaseContext.h changed reference counting for cursors 2013-09-16 13:51:33 +02:00
arango.cpp call global instance destructor 2014-02-02 09:23:04 +01:00