| commit | 122550a9a00fae430a378492537436b9bad87443 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Mon Jul 20 08:28:52 2020 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Mon Jul 20 08:29:00 2020 -0400 |
| tree | 06c5e548f9353013282aed096778cc6b3152991e | |
| parent | ccbcd41e57edcd1716a313a29932d535a5da6339 [diff] | |
| parent | 80a68adace950915553b1d24b0a1a6f1d008d235 [diff] |
Merge branch 'stable-3.2' * stable-3.2: Bump Bazel version to 3.4.1 Change-Id: Ie296c2b1bfff73a57ffd8dd48eaeddff2ed71e51
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;