Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/arangod
History
Jan Steemann 5373f1cea0 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/edge-collection.h
 		2014-05-21 18:06:44 +02:00
..
Actions Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Ahuacatl Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
BitIndexes Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
CapConstraint Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Cluster Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
FulltextIndex Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
GeoIndex Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
HashIndex Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
IndexIterators Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
IndexOperators Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
MRServer Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Replication Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 18:06:44 +02:00
RestHandler Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
RestServer Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
SkipLists Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Transaction use TRI_voc_tid_t 2014-04-11 17:30:56 +02:00
Utils Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 18:06:44 +02:00
V8Server Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 18:06:44 +02:00
VocBase Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 18:06:44 +02:00
Wal update() 2014-05-21 18:05:08 +02:00
CMakeLists.txt Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Makefile.files Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00