Merge "Made runJobs.php respect time limits better and try to bail before OOMs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 13 Aug 2013 18:09:10 +0000 (18:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 13 Aug 2013 18:09:10 +0000 (18:09 +0000)
1  2 
maintenance/runJobs.php

Simple merge