Merge "Remove deprecated CONN_TRX_AUTO alias"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 3 Jul 2018 17:08:02 +0000 (17:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 3 Jul 2018 17:08:02 +0000 (17:08 +0000)

Trivial merge