Merge "use slave for row estimate in updateCollation.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 11 May 2016 17:06:05 +0000 (17:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 11 May 2016 17:06:05 +0000 (17:06 +0000)
1  2 
maintenance/updateCollation.php

Simple merge