opendev
/
gerrit
Code Issues Proposed changes

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
This commit is contained in:
David Pursehouse 2018-11-17 00:31:41 -08:00
parent b08c456166 e6c4d37611
commit 562b166f6d
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -38,6 +38,7 @@ Joel Dodge <dodgejoel@gmail.com>
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>

1
plugins/BUILD
View File

@ -41,6 +41,7 @@ EXPORTS = [
"//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",