commit abf0df67517e507820c36b7d6d4931980ca10ae6
author JouYoung Suh <jouyoung.suh@ericsson.com> Thu Dec 23 12:00:47 2021 -0500
committer JouYoung Suh <jouyoung.suh@ericsson.com> Thu Dec 23 12:04:53 2021 -0500
tree ca3da23e3fd93aeb4cb9049114448f6de22e01ce
parent 2feca145f8aed8f49093f7452b03578aaa24dade
parent 5b3e0bb44b814a41117979ea83554914d541cac5

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  fixup!: Fix omitted documentation
  fixup!: Fix omitted import plugins and libraries
  Display Used Permits in addition to permits available
  Add readable text to the limit type

Change-Id: I64d23d6df67afd1a40b7ad5205faed907e492c6d

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 5720e36..0573d46 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "87fd5f0d0a89d01df13deaf2d21a4bdb3bc03cfd",
+    commit = "8dc0767541f16b35d2136eccebffd9ebe2b81133",
     #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 4c73d22..035e45b 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;