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
..
ContinuousSyncer.cpp	Use StringBuffer in SimpleHttpResult rather than stringstream.	2014-05-07 16:35:40 +02:00
ContinuousSyncer.h	issue #826: Replication fails when a collection's configuration changes	2014-04-22 11:31:01 +02:00
InitialSyncer.cpp	fixed issues found by scan-build	2014-05-15 10:09:06 +02:00
InitialSyncer.h	removed second logger implementation	2013-10-30 00:38:25 +01:00
Syncer.cpp	update()	2014-05-21 18:05:08 +02:00
Syncer.h	removed second logger implementation	2013-10-30 00:38:25 +01:00
replication-static.cpp	Header cleanup: use #include "Basics/Common.h" in all C++ files.	2014-05-21 15:50:30 +02:00
replication-static.h	Header cleanup: use #include "Basics/Common.h" in all C++ files.	2014-05-21 15:50:30 +02:00