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

Author: dooleydevin

debian/changelog

@@ -1,3 +1,18 @@
+github-backup-utils (3.7.2) UNRELEASED; urgency=medium
+
+  * Move check for git for ssh muxing into ghe-ssh #378
+  * ghe-export-settings sets json file extension, should be ini? #482
+
+ -- Devin Dooley <[email protected]>  Wed, 16 Aug 2023 23:11:51 +0000
+
+github-backup-utils (3.7.1) UNRELEASED; urgency=medium
+
+  * Don't fail a backup if the Management Console password isn't set #416
+  * Prevent restoring snapshots to older releases #420
+  * Use old rsync restore method for pages prior to 2.13 #426
+
+ -- Devin Dooley <[email protected]>  Fri, 21 Jul 2023 02:08:41 +0000
+
 github-backup-utils (3.7.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.7.0
+3.7.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