Merge "Enforce stricter slave lag limits for bot API requests"

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

Tue, 27 Oct 2015 10:30:44 +0000 (10:30 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 27 Oct 2015 10:30:44 +0000 (10:30 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 27 Oct 2015 10:30:44 +0000 (10:30 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 27 Oct 2015 10:30:44 +0000 (10:30 +0000)
diff --cc RELEASE-NOTES-1.27
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 27 Oct 2015 10:30:44 +0000 (10:30 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 27 Oct 2015 10:30:44 +0000 (10:30 +0000)
		1	2
RELEASE-NOTES-1.27	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history