1
0
Fork 0
arangodb/arangod
Jan Steemann d5e695e63f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/ArangoServer.h
	arangod/VocBase/server.cpp
	js/common/bootstrap/errors.js
2014-06-13 02:23:03 +02:00
..
Actions Remove many extern "C" declarations that are no longer needed. 2014-05-22 10:19:03 +02:00
Ahuacatl add handlers for remove, update, save, replace 2014-06-12 14:00:52 +02:00
BitIndexes More checks for protected getShaper accesses. 2014-06-12 10:38:39 +02:00
CapConstraint More checks for protected getShaper accesses. 2014-06-12 10:38:39 +02:00
Cluster cppcheck 2014-06-11 17:53:44 +02:00
FulltextIndex fixed some indexes 2014-06-08 03:03:16 +02:00
GeoIndex More checks for protected getShaper accesses. 2014-06-12 10:38:39 +02:00
HashIndex More checks for protected getShaper accesses. 2014-06-12 10:38:39 +02:00
IndexIterators Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
IndexOperators Remove many extern "C" declarations that are no longer needed. 2014-05-22 10:19:03 +02:00
Replication removed implicit parameter from function signature 2014-06-13 01:59:19 +02:00
RestHandler removed implicit parameter from function signature 2014-06-13 01:59:19 +02:00
RestServer Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 02:23:03 +02:00
SkipLists More checks for protected getShaper accesses. 2014-06-12 10:38:39 +02:00
Transaction TRI_ASSERT 2014-06-06 11:25:19 +02:00
Utils removed implicit parameter from function signature 2014-06-13 01:59:19 +02:00
V8Server fixed crash in dump 2014-06-13 01:53:44 +02:00
VocBase Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 02:23:03 +02:00
Wal fixed crash in dump 2014-06-13 01:53:44 +02:00
CMakeLists.txt Create thread global transaction protection assertions. 2014-06-10 11:31:07 +02:00
Makefile.files Create thread global transaction protection assertions. 2014-06-10 11:31:07 +02:00