Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Propagate FetchRefReplicatedEvent Send small refs as a fetch call payload Send ref content as a fetch call payload Index change upon propagation Propagate FetchRefReplicatedEvent upon a Ref fetch Change-Id: I849d9244c623b9fa584f9ac75e773c2c3c3cb462
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;