| commit | 70cd2577260c3740875157420192c1b3cff01f8c | [log] [tgz] |
|---|---|---|
| author | Marcin Czech <maczech@gmail.com> | Wed Sep 22 13:40:35 2021 +0200 |
| committer | Marcin Czech <maczech@gmail.com> | Wed Sep 22 13:40:35 2021 +0200 |
| tree | 283f725b34c3c59e085f2558dab3f8a5cb3c2a1a | |
| parent | 7ba009afa97a08009489768716354e0a0580d710 [diff] | |
| parent | b25c065781937856f5431514adf1740052d91d61 [diff] |
Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Allow using pull-replication on replica nodes Change-Id: Ie40e969e9f5665f3821c8cd57d074b40c6929a32
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;