Merge "[FileBackend] Added preloadCache() so callers can trigger cache getMulti()."

author Catrope <roan.kattouw@gmail.com>

Wed, 29 Aug 2012 00:13:57 +0000 (00:13 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 29 Aug 2012 00:13:57 +0000 (00:13 +0000)
author Catrope <roan.kattouw@gmail.com>
Wed, 29 Aug 2012 00:13:57 +0000 (00:13 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Aug 2012 00:13:57 +0000 (00:13 +0000)
diff --cc includes/filebackend/FileBackend.php
Simple merge
diff --cc includes/filebackend/FileBackendStore.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Wed, 29 Aug 2012 00:13:57 +0000 (00:13 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 29 Aug 2012 00:13:57 +0000 (00:13 +0000)
		1	2
includes/filebackend/FileBackend.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/filebackend/FileBackendStore.php	patch \|	diff1 \|	diff2 \|	blob \| history