| commit | 4fb129877f27857ce62d9619a5ff3186241e5590 | [log] [tgz] |
|---|---|---|
| author | Luca Milanesio <luca.milanesio@gmail.com> | Thu Aug 25 01:07:56 2022 +0100 |
| committer | Luca Milanesio <luca.milanesio@gmail.com> | Thu Aug 25 01:08:00 2022 +0100 |
| tree | 48aa45582d7e3fab21ccf2e351c4bf629df5437f | |
| parent | 10954ec5b55903dc22f4a8b08b2c2353bb4fa050 [diff] | |
| parent | a0d4117aebd6bb8c3e4bc8c78445a895e56c4d99 [diff] |
Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Do not use timer.getStartTime() when propating timers metrics Change-Id: I7abf8f2f353d889baf9e0f5f97c2867b7fd1d3ae
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 4ae3f7d..6bf4c21 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 1daf638..7ab44f9 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;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/PullReplicationIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/PullReplicationIT.java index 7fcff10..ec60793 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/PullReplicationIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/PullReplicationIT.java
@@ -28,7 +28,7 @@ import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.Project.NameKey; import com.google.gerrit.entities.RefNames;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/UpdateHeadActionIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/UpdateHeadActionIT.java index 8006064..aa07a7c 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/UpdateHeadActionIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/UpdateHeadActionIT.java
@@ -20,7 +20,7 @@ import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.projects.BranchInput; import com.google.gerrit.extensions.api.projects.HeadInput; import com.google.gson.Gson;