commit | 7a86aee395dd6082f29267ce2f5aa9b5865255c3 | [log] [tgz] |
---|---|---|
author | Luca Milanesio <luca.milanesio@gmail.com> | Mon Nov 30 15:00:19 2020 +0000 |
committer | Luca Milanesio <luca.milanesio@gmail.com> | Mon Nov 30 15:00:19 2020 +0000 |
tree | c015db0e49229b97ec3c5a4b5f49cede8ffab30f | |
parent | d80414186a21bb416005b8309c528c733e9493b0 [diff] | |
parent | 43641952b95f56bbaf2a9ddcb9e54f5bde772e90 [diff] |
Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Always replicate changes regardless of the permissions Change-Id: I8395f1ac7eebea3e6f5995434b05aa0c9de06552
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/RefsFilter.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/RefsFilter.java index de6c97d..0b9a691 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/RefsFilter.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/RefsFilter.java
@@ -16,7 +16,7 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.RefNames; import com.google.inject.Inject; import com.google.inject.Singleton;
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 639bc80..ec61a5d 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
@@ -24,9 +24,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;