Merge "Made ReplicatedBagOStuff wrapping the SQL class the default stash"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Wed, 24 Jun 2015 20:09:53 +0000 (20:09 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 24 Jun 2015 20:09:53 +0000 (20:09 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 24 Jun 2015 20:09:53 +0000 (20:09 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 24 Jun 2015 20:09:53 +0000 (20:09 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/objectcache/SqlBagOStuff.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 24 Jun 2015 20:09:53 +0000 (20:09 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 24 Jun 2015 20:09:53 +0000 (20:09 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/objectcache/SqlBagOStuff.php	patch \|	diff1 \|	diff2 \|	blob \| history