1
0
Fork 0
arangodb/lib
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
2014-02-21 15:28:21 +01:00
..
Admin Add HTTP REST API call for shutdown. 2014-02-12 10:47:43 +01:00
ApplicationServer added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Basics Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:07 +01:00
BasicsC Fix a comment. 2014-02-21 15:15:40 +01:00
Dispatcher Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:07 +01:00
Documentation
GeneralServer Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:07 +01:00
HttpServer Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-21 15:28:21 +01:00
JsonParser fixed compiler warnings and freebsd problem 2013-11-01 23:05:43 +01:00
MRuby fixed compiler warnings and freebsd problem 2013-11-01 23:05:43 +01:00
ProgramOptions Fail hard if a configuration option cannot be parsed. 2014-02-18 12:11:34 +01:00
Rest Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-21 15:28:21 +01:00
Scheduler Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-21 15:28:21 +01:00
ShapedJson mini optimisations for shaping 2013-11-22 02:41:39 +01:00
SimpleHttpClient Fix a deadlock situation in the SimpleHttpClient if the server dies. 2014-02-21 15:14:43 +01:00
Statistics added detailed HTTP request statistics 2013-12-13 16:00:02 +01:00
Utilities Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-30 19:40:21 +01:00
V8 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-21 15:28:21 +01:00
Zip
CMakeLists.txt Fix cmake entry for RestShutdownHandler 2014-02-17 16:30:23 +01:00
Makefile.bison
Makefile.files Add HTTP REST API call for shutdown. 2014-02-12 10:47:43 +01:00
Makefile.flex
valgrind.supp