Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
ReplicationFileBasedConfig: fix UnusedException error from ErrorProne
Clarify that starred-changes ref is not needed on slaves
Move the fix in ReplicationFileBasedConfig to DestinationsCollection.
Change-Id: I2fca1802a26aaf37ba5e6edc81eaa799ac3b27fe
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java b/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java
index 8aa3919..2f210e0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java
@@ -340,7 +340,7 @@
result.add(new RemoteConfig(cfg, name));
} catch (URISyntaxException e) {
throw new ConfigInvalidException(
- String.format("remote %s has invalid URL in %s", name, cfg.getFile()));
+ String.format("remote %s has invalid URL in %s", name, cfg.getFile()), e);
}
}
return result;
diff --git a/src/main/resources/Documentation/about.md b/src/main/resources/Documentation/about.md
index 69a371b..adb8d4c 100644
--- a/src/main/resources/Documentation/about.md
+++ b/src/main/resources/Documentation/about.md
@@ -24,7 +24,7 @@
* `refs/users/*` (user branches)
* `refs/meta/external-ids` (external IDs)
-* `refs/starred-changes/*` (star labels)
+* `refs/starred-changes/*` (star labels, not needed for Gerrit slaves)
* `refs/sequences/accounts` (account sequence numbers, not needed for Gerrit
slaves)
