Merge "[FileBackend] Syncing from journal support."

author Tim Starling <tstarling@wikimedia.org>

Thu, 17 May 2012 07:03:34 +0000 (07:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 17 May 2012 07:03:34 +0000 (07:03 +0000)
author Tim Starling <tstarling@wikimedia.org>
Thu, 17 May 2012 07:03:34 +0000 (07:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 17 May 2012 07:03:34 +0000 (07:03 +0000)
diff --cc includes/filerepo/backend/FileBackend.php
Simple merge
diff --cc includes/filerepo/backend/filejournal/DBFileJournal.php
Simple merge
diff --cc includes/filerepo/backend/filejournal/FileJournal.php
Simple merge
author	Tim Starling <tstarling@wikimedia.org>
	Thu, 17 May 2012 07:03:34 +0000 (07:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 17 May 2012 07:03:34 +0000 (07:03 +0000)
		1	2
includes/filerepo/backend/FileBackend.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/filerepo/backend/filejournal/DBFileJournal.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/filerepo/backend/filejournal/FileJournal.php	patch \|	diff1 \|	diff2 \|	blob \| history