diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2020-01-24 10:11:52 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2020-01-24 10:13:51 +0900 |
| commit | 56b7814354c04448da9ba5fddcbe732de02f68c1 (patch) | |
| tree | cb0ce71726ced7d2e026c5a99d2aed771a86e936 | |
| parent | 0d91ffd189297f511c93d40a864978b5774805c1 (diff) | |
| parent | 707a917c1d985afaa1dfeb9c6381888d1ab0cf8a (diff) | |
Merge branch 'stable-3.0' into stable-3.1v3.1.3
* 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
| -rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java | 2 | ||||
| -rw-r--r-- | src/main/resources/Documentation/about.md | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ public class DestinationsCollection implements ReplicationDestinations, Replicat 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 @@ To replicate the account data in NoteDb the following branches from the * `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) |