Merge "Add $wgMaxJobDBWriteDuration setting for avoiding replication lag"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 12 Jun 2017 18:15:57 +0000 (18:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 12 Jun 2017 18:15:57 +0000 (18:15 +0000)
1  2 
includes/DefaultSettings.php
includes/jobqueue/JobRunner.php

Simple merge
Simple merge