Merge "update.php: Remove max seconds of lag from wfWaitForSlaves() call"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 6 May 2015 20:37:26 +0000 (20:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 6 May 2015 20:37:26 +0000 (20:37 +0000)
1  2 
maintenance/update.php

Simple merge