1
0
Fork 0
arangodb/lib
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
2014-02-28 20:37:05 +01:00
..
Admin cleanup 2014-02-25 15:32:07 +01:00
ApplicationServer changed info to debug 2014-02-28 12:28:31 +01:00
Basics Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:07 +01:00
BasicsC Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-28 20:37:05 +01:00
Dispatcher cleanup 2014-02-25 15:32:07 +01:00
Documentation
GeneralServer cleanup 2014-02-25 15:32:07 +01:00
HttpServer cleanup 2014-02-25 15:32:07 +01:00
JsonParser
MRuby
ProgramOptions Fail hard if a configuration option cannot be parsed. 2014-02-18 12:11:34 +01:00
Rest cleanup 2014-02-25 15:32:07 +01:00
Scheduler cleanup 2014-02-25 15:32:07 +01:00
ShapedJson properly acquire shape write locks 2014-02-28 18:43:09 +01:00
SimpleHttpClient Fix a deadlock situation in the SimpleHttpClient if the server dies. 2014-02-21 15:14:43 +01:00
Statistics
Utilities Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-30 19:40:21 +01:00
V8 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Zip
CMakeLists.txt added requeue 2014-02-25 12:07:16 +01:00
Makefile.bison
Makefile.files added requeue 2014-02-25 12:07:16 +01:00
Makefile.flex
valgrind.supp