commit 80a68adace950915553b1d24b0a1a6f1d008d235
author Marco Miller <marco.miller@ericsson.com> Sat Jul 18 17:47:27 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Sat Jul 18 17:47:33 2020 -0400
tree a5a2a8679e38e78b294c3f21abf270190882153a
parent f738a74f08cfe1ac1b9e7260a9359a4dc08fdfbf
parent 32afb3ca5aa6fd3a3cbf4417fe149a34f3e78af7

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.4.1

Change-Id: I227cf8c4b45e2dde130c33668ca9e932e73bf4fb

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 7473df7..e53cc13 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "b6cb89690a5e06261932eb30c95fd8db34a7943a",
+    commit = "74f9d8e76d5014d218ae6fe55127a5288c9a32c3",
     #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;