Merge "Support non-replicating DB clusters for static datasets"

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

Tue, 24 May 2016 23:59:24 +0000 (23:59 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 24 May 2016 23:59:24 +0000 (23:59 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 24 May 2016 23:59:24 +0000 (23:59 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 24 May 2016 23:59:24 +0000 (23:59 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/db/loadbalancer/LoadBalancer.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 24 May 2016 23:59:24 +0000 (23:59 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 24 May 2016 23:59:24 +0000 (23:59 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/loadbalancer/LoadBalancer.php	patch \|	diff1 \|	diff2 \|	blob \| history