Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/arangod/Replication
History
Frank Celler 055e172bdb Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 
Conflicts:
	arangod/Replication/Syncer.cpp
	arangod/VocBase/index-garbage-collector.c
	build_posix.h
	html/admin/api-docs/traversal.json
	js/apps/aardvark/api-docs/collection.json
	js/apps/aardvark/api-docs/cursor.json
	js/apps/aardvark/api-docs/document.json
	js/apps/aardvark/api-docs/edge.json
	js/apps/aardvark/api-docs/edges.json
	js/apps/aardvark/api-docs/graph.json
	js/apps/aardvark/api-docs/index.json
	js/apps/aardvark/api-docs/replication.json
	js/apps/aardvark/api-docs/simple.json
	js/apps/aardvark/api-docs/system.json
 		2013-09-05 13:03:07 +02:00
..
ContinuousSyncer.cpp show dbname in error messages 2013-08-20 09:43:19 +02:00
ContinuousSyncer.h added chunkSize for replication-applier 2013-08-02 11:03:54 +02:00
InitialSyncer.cpp block compaction & datafile removal while dumping 2013-08-30 17:25:09 +02:00
InitialSyncer.h block compaction & datafile removal while dumping 2013-08-30 17:25:09 +02:00
Syncer.cpp Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 2013-09-05 13:03:07 +02:00
Syncer.h Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-05 12:34:45 +02:00
replication-static.cpp split of initial and continuous sync, currently not working 2013-07-30 14:13:49 +02:00
replication-static.h split of initial and continuous sync, currently not working 2013-07-30 14:13:49 +02:00