Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/arangod
History
Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
 		2014-06-02 09:52:05 +02:00
..
Actions Remove many extern "C" declarations that are no longer needed. 2014-05-22 10:19:03 +02:00
Ahuacatl merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
BitIndexes merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
CapConstraint merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Cluster merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
FulltextIndex removed fsrt 2014-05-30 20:23:15 +02:00
GeoIndex merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
HashIndex merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +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 merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
RestHandler merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
RestServer Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-02 09:52:05 +02:00
SkipLists merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Transaction merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Utils merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
V8Server Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-02 09:52:05 +02:00
VocBase Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-02 09:52:05 +02:00
Wal merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
CMakeLists.txt merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Makefile.files merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00