commit ea1485b5cee80849b87534ab7b23fb133218ba42
author Marco Miller <marco.miller@ericsson.com> Tue Jun 09 14:58:07 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Tue Jun 09 14:58:07 2020 -0400
tree 197ce9792af831620e04ce239544980b8cc41d6c
parent 9da8506a7e94ac6c6fc55f86e4f697890c685326
parent 3a53630f28344bf065faf9394caefc3bcc63a272

Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-3.1 to build with 3.1.6 API
  Upgrade bazlets to latest stable-3.0 to build with 3.0.10 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.21 API
  Upgrade bazlets to latest stable-2.15 to build with 2.15.19 API
  Upgrade bazlets to latest stable-2.14 to build with 2.14.21 API

Change-Id: Ic9ebfc9d69424c458bf58954bb9cab88bf231968

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index bb21f31..bcea268 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "69ae6ee516ec1cc51d0a07fe4419a325eb9063ce",
+    commit = "5c26af9e0374ede4cd67939be972adf6c4cda791",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java b/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java
index b324a2a..52f1f36 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java
@@ -16,7 +16,7 @@
 
 import static com.google.gerrit.testing.GerritJUnit.assertThrows;
 
-import com.google.gerrit.acceptance.GlobalPluginConfig;
+import com.google.gerrit.acceptance.config.GlobalPluginConfig;
 import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.TestPlugin;
 import com.google.gerrit.acceptance.UseLocalDisk;