| commit | 7ba009afa97a08009489768716354e0a0580d710 | [log] [tgz] |
|---|---|---|
| author | Antonio Barone <syntonyze@gmail.com> | Fri Jul 30 12:03:24 2021 +0200 |
| committer | Antonio Barone <syntonyze@gmail.com> | Fri Jul 30 12:03:24 2021 +0200 |
| tree | 73e0b64afd31b89267cc89bf103acb56c8ce4330 | |
| parent | 592833936ed9fadf4a4086a618e784e7ca964d80 [diff] | |
| parent | 9b3bdbe9fec33e79fa59743ffc88d5394e59c5c7 [diff] |
Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Allow to access source of fetch replication events Prevent misleading Invalid id' error in logs Change-Id: If255c366ae9253a12fb77135fe444a50ef763e53
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java index 20d9aba..2d8bce4 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java
@@ -25,9 +25,9 @@ import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Lists; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.StorageException;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/filter/RefsFilter.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/filter/RefsFilter.java index 0bd7564..7ec19ea 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/filter/RefsFilter.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/filter/RefsFilter.java
@@ -15,7 +15,7 @@ package com.googlesource.gerrit.plugins.replication.pull.filter; import com.google.common.base.Strings; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.googlesource.gerrit.plugins.replication.ReplicationConfig; import java.util.List; import org.eclipse.jgit.lib.Config;