Merge branch 'stable-3.9' into stable-3.10 * stable-3.9: Fix incorrect documentation about excludeRefs Document replicateHiddenProjects setting Log stacktrace when replication fails Change-Id: I2eb283eb0ec6f3188947617c43269b60ae872be7
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchOne.java index bad77d3..042ae0f 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchOne.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchOne.java
@@ -391,7 +391,7 @@ repLog.error( String.format("Terminal failure. Cannot replicate [%s] from %s", taskIdHex, uri), e); } catch (TransportException e) { - repLog.error("[{}] Cannot replicate from {}: {}", taskIdHex, uri, e.getMessage()); + repLog.error(String.format("[%s] Cannot replicate from %s", taskIdHex, uri), e); if (replicationType == ReplicationType.ASYNC && e instanceof LockFailureException) { lockRetryCount++; // The LockFailureException message contains both URI and reason
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md index 74648eb..546df2e 100644 --- a/src/main/resources/Documentation/config.md +++ b/src/main/resources/Documentation/config.md
@@ -286,12 +286,6 @@ the ref `foo/bar`, but no other refs. By default, the following refs are excluded from the git fetch calls: - - refs/users/* - - refs/meta/config - - refs/sequences/* - - refs/meta/external-ids - - refs/groups/* - - refs/meta/group-names - refs/cache-automerge/* - refs/starred-changes/* @@ -531,6 +525,12 @@ By default, false, do *not* replicate project deletions. +remote.NAME.replicateHiddenProjects +: If true, hidden projects will also be replicated to the +remote site. + + By default, false, do *not* replicate hidden projects. + remote.NAME.mirror : If true, replication will remove local branches and tags that are absent remotely or invisible to the replication (for example read access