commit 562b166f6d56bf19396a71ef8d605713a62b119e
author David Pursehouse <dpursehouse@collab.net> Sat Nov 17 00:31:41 2018 -0800
committer David Pursehouse <dpursehouse@collab.net> Sat Nov 17 00:31:41 2018 -0800
tree dcfce5137c6ce670347f078356d03ee0a4cd4fb3
parent b08c456166deba90671c3b5e0f2bdde9baf10e27
parent e6c4d376117f0d9c19c7d0577b9fd283b566a033

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add Lawrence Dubé to .mailmap
  Bazel: Export gerrit-util-cli:cli in plugin API
  Update git submodules

Change-Id: I4c70d8d9638e5cdedb3dcdc3de48d9c92cdd046f

.mailmap

diff --git a/.mailmap b/.mailmap
index f2fe6ca..cbf1f3b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -38,6 +38,7 @@
 Johan Björk <jbjoerk@gmail.com>                                                             Johan Bjork <phb@spotify.com>
 JT Olds <hello@jtolds.com>                                                                  <jtolds@gmail.com>
 Kasper Nilsson <kaspern@google.com>                                                         <kaspern@google.com>
+Lawrence Dubé <ldube@audiokinetic.com>                                                      <ldube@audiokinetic.com>
 Lei Sun <lei.sun01@sap.com>                                                                 LeiSun <lei.sun01@sap.com>
 Lincoln Oliveira Campos Do Nascimento <lincoln.oliveiracamposdonascimento@sonyericsson.com> lincoln <lincoln.oliveiracamposdonascimento@sonyericsson.com>
 Luca Milanesio <luca.milanesio@gmail.com>                                                   <luca@gitent-scm.com>

plugins/BUILD

diff --git a/plugins/BUILD b/plugins/BUILD
index 137be6e..eed8383 100644
--- a/plugins/BUILD
+++ b/plugins/BUILD
@@ -41,6 +41,7 @@
     "//java/com/google/gerrit/server/logging",
     "//java/com/google/gerrit/server/schema",
     "//java/com/google/gerrit/server/util/time",
+    "//java/com/google/gerrit/util/cli",
     "//java/com/google/gerrit/util/http",
     "//lib/commons:compress",
     "//lib/commons:dbcp",