Merge branch 'stable-3.2' * stable-3.2: 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: Ibdd979e288695697c38eb7ee4f8975591849d1b1
diff --git a/WORKSPACE b/WORKSPACE index 0573d46..4f2d28b 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -12,4 +12,4 @@ "gerrit_api", ) -gerrit_api() +gerrit_api(version = "3.3.0-SNAPSHOT")
diff --git a/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/Configuration.java b/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/Configuration.java index bb6db02..810e85e 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/Configuration.java +++ b/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/Configuration.java
@@ -17,8 +17,8 @@ import com.google.common.collect.ArrayTable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Table; -import com.google.gerrit.common.data.GroupDescription.Basic; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription.Basic; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.server.config.PluginConfigFactory; import com.google.gerrit.server.group.GroupResolver;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/ConfigurationTest.java b/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/ConfigurationTest.java index cc353a5..a4046b3 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/ConfigurationTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/ConfigurationTest.java
@@ -18,8 +18,8 @@ import static com.google.gerrit.testing.GerritJUnit.assertThrows; import static org.mockito.Mockito.when; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.server.config.PluginConfigFactory; import com.google.gerrit.server.group.GroupResolver; import com.google.inject.ProvisionException;