Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/arangod/RestServer
History
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 		2014-02-20 21:02:07 +01:00
..
ArangoServer.cpp Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:07 +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 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 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