| commit | cdd8fc0909426922efc6d5955456c8de32c27555 | [log] [tgz] |
|---|---|---|
| author | Luca Milanesio <luca.milanesio@gmail.com> | Tue Apr 16 15:30:41 2024 +0100 |
| committer | Luca Milanesio <luca.milanesio@gmail.com> | Tue Apr 16 15:30:41 2024 +0100 |
| tree | 1162e33e9c735e65a15eb0f0d858ff45a29c8b46 | |
| parent | bcabdab96eaf6b90532bd39be9f83ddafb7ba7cd [diff] | |
| parent | 6b68ef370997f0e6e01f8a47e4b4e32064b86aba [diff] |
Merge branch 'stable-3.10' * stable-3.10: Adapt to replication api changes on stable-3.10 Specify cache.threads = 0 in the multi-site config documentation Change-Id: Iecad2b79e04c22d31da3f003174c799c20dacf55
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/MultisiteReplicationPushFilter.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/MultisiteReplicationPushFilter.java index 0aba056..f076b7f 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/MultisiteReplicationPushFilter.java +++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/MultisiteReplicationPushFilter.java
@@ -23,7 +23,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.googlesource.gerrit.plugins.multisite.Configuration; -import com.googlesource.gerrit.plugins.replication.ReplicationPushFilter; +import com.googlesource.gerrit.plugins.replication.api.ReplicationPushFilter; import java.io.IOException; import java.util.Collections; import java.util.HashSet;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/PushReplicationFilterModule.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/PushReplicationFilterModule.java index 8a8e826..77ac478 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/PushReplicationFilterModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/PushReplicationFilterModule.java
@@ -16,7 +16,7 @@ import com.google.gerrit.extensions.registration.DynamicItem; import com.google.inject.AbstractModule; -import com.googlesource.gerrit.plugins.replication.ReplicationPushFilter; +import com.googlesource.gerrit.plugins.replication.api.ReplicationPushFilter; public class PushReplicationFilterModule extends AbstractModule {
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md index 3baa911..0485d5b 100644 --- a/src/main/resources/Documentation/config.md +++ b/src/main/resources/Documentation/config.md
@@ -13,6 +13,9 @@ ```cache.synchronize``` : Whether to synchronize cache evictions. Set to false when relying on low cache TTLs and therefore cache eviction is not strictly needed. + It requires disabling the background cache evictions notifications in + `gerrit.config` by setting `cache.threads = 0`. + Defaults to true. ```cache.threadPoolSize```