commit 34894e5868b016fe91d96378a9fd2f89bb7b9ea6
author Marco Miller <marco.miller@ericsson.com> Fri Oct 30 09:33:19 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Fri Oct 30 09:33:19 2020 -0400
tree 6eabf6c10a08a13d757155217823c75343541707
parent 2d5975376ab7e7379d7e7dd28884614f5045f94f
parent 07453b7cc01c54d8445a2e0a90a664aaec78524d

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.7.0
  Upgrade bazlets to latest stable-3.0 to build with 3.0.13 API

Change-Id: I7bfe4d3bb3c9490580d6a0a5e0f9408dd4023dec

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index d3a9d8d..4e9ba46 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
+    commit = "0f81174e3d1b892a1342ebc75bb4bbb158ae0efe",
     #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;