Merge "Don't throw an exception when waiting for replication times out"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Sep 2018 02:20:12 +0000 (02:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Sep 2018 02:20:12 +0000 (02:20 +0000)
1  2 
includes/GlobalFunctions.php
includes/installer/DatabaseUpdater.php
includes/installer/MysqlUpdater.php
includes/jobqueue/jobs/RefreshLinksJob.php
maintenance/updateSpecialPages.php

Simple merge
Simple merge
Simple merge