Merge "Make insertRedirectEntry() use upsert() to reduce contention"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Nov 2016 19:21:05 +0000 (19:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Nov 2016 19:21:05 +0000 (19:21 +0000)

Trivial merge