Merge branch 'enterprise-3.6-release' into enterprise-3.6-backport-492-add-host-online-check

Author: dooleydevin

debian/changelog

@@ -1,3 +1,17 @@
+github-backup-utils (3.6.2) UNRELEASED; urgency=medium
+
+  * Move check for git for ssh muxing into ghe-ssh #378
+  * add option to generate a persistent rsync log #494
+
+ -- Devin Dooley <[email protected]>  Wed, 16 Aug 2023 23:09:56 +0000
+
+github-backup-utils (3.6.1) UNRELEASED; urgency=medium
+
+  * Switch to TMPDIR before initiating SSH multiplexing workaround to prevent locking the destination filesystem #348
+  * Disable pager and context when running git-diff #411
+
+ -- Devin Dooley <[email protected]>  Fri, 21 Jul 2023 01:05:34 +0000
+
 github-backup-utils (3.6.0) UNRELEASED; urgency=medium
 
 

share/github-backup-utils/ghe-backup-config

@@ -76,8 +76,10 @@ ghe_parallel_check() {
   GHE_PARALLEL_COMMAND="parallel"
   local x
   for x in \
+      /usr/bin/parallel-moreutils \
       /usr/bin/parallel.moreutils \
       /usr/bin/parallel_moreutils \
+      /usr/bin/moreutils-parallel \
       /usr/bin/moreutils.parallel \
       /usr/bin/moreutils_parallel \
       ; do

share/github-backup-utils/version

@@ -1 +1 @@
-3.6.0
+3.6.2

test/testlib.sh

@@ -578,8 +578,10 @@ setup_moreutils_parallel() {
   # We need moreutils parallel
   local x
   for x in \
+      /usr/bin/parallel-moreutils \
       /usr/bin/parallel.moreutils \
       /usr/bin/parallel_moreutils \
+      /usr/bin/moreutils-parallel \
       /usr/bin/moreutils.parallel \
       /usr/bin/moreutils_parallel \
       ; do