Merge pull request #639 from github/enterprise-3.10-backport-patch-3.10.1

Patch release 3.10.1

Author: dooleydevin

.gitignore

@@ -1,5 +1,6 @@
 /backup.config
 /data
 /dist
+.DS_Store
 dash
 parallel

bin/ghe-host-check

@@ -137,7 +137,7 @@ fi
 
 # backup-utils 2.13 onwards limits support to the current and previous two releases
 # of GitHub Enterprise Server.
-supported_minimum_version="3.7.0"
+supported_minimum_version="3.8.0"
 
 if [ "$(version $version)" -ge "$(version $supported_minimum_version)" ]; then
   supported=1

debian/changelog

@@ -1,3 +1,40 @@
+github-backup-utils (3.10.1) UNRELEASED; urgency=medium
+
+
+ -- Devin Dooley <[email protected]>  Mon, 02 Oct 2023 20:38:31 +0000
+
+github-backup-utils (3.10.0) UNRELEASED; urgency=medium
+
+
+ -- Balwinder Sohi <[email protected]>  Wed, 30 Aug 2023 17:39:31 +0000
+
+github-backup-utils (3.10.0) UNRELEASED; urgency=medium
+
+  * Remove -o option from ps use #341
+  * Switch to TMPDIR before initiating SSH multiplexing workaround to prevent locking the destination filesystem #348
+  * Move check for git for ssh muxing into ghe-ssh #378
+  * Check filesystem supports hardlinks #388
+  * Remove check for git from ghe-ssh #393
+  * Clean up stale HA nodes on restore #396
+
+ -- Balwinder Sohi <[email protected]>  Wed, 09 Aug 2023 19:37:10 +0000
+
+github-backup-utils (3.9.0) UNRELEASED; urgency=medium
+
+  * Set restore status on all cluster nodes #274
+  * Fix pages backups and restores in GitHub Enterprise 11.10 #275
+  * Backup and restore custom CA certificates #281
+  * Set the benchmark file path consistently #283
+  * Suppress dd output noise #289
+  * Track completeness of Elasticsearch JSON dumps #298
+  * Use existing Elasticsearch indices to speed up transfer during a restore #310
+  * Include the user data directory in the benchmark name #311
+  * Use calculated routes when backing up storage data from a cluster #318
+  * Refresh the existing indices when restoring Elasticsearch indices to cluster #328
+  * Use git to generate short name for SSH multiplex control path  #335
+
+ -- Junior Eluhu <[email protected]>  Mon, 12 Jun 2023 20:46:10 +0000
+
 github-backup-utils (3.8.0) focal; urgency=medium
 
  -- Daniel Johnson <[email protected]>  Tue, 07 Feb 2023 21:43:26 +0000

docs/requirements.md

@@ -7,9 +7,11 @@ storage and must have network connectivity with the GitHub Enterprise Server app
 
 Backup host software requirements are modest: Linux or other modern Unix operating system (Ubuntu is highly recommended) with [bash][1], [git][2], [OpenSSH][3] 5.6 or newer, [rsync][4] v2.6.4 or newer* (see [below](#april-2023-update-of-rsync-requirements) for exceptions), [jq][11] v1.5 or newer, and [bc][12] v1.07 or newer.
 
-The parallel backup and restore feature will require [GNU awk][10] and [moreutils][9] to be installed.
+Ubuntu is the operating system we use to test `backup-utils` and it’s what we recommend you use too. You are welcome to use a different operating system, and we'll do our best to help you if you run into issues. But we can't guarantee that we'll be able to resolve issues that are specific to that operating system.
+
+Additionally, we encourage the use of [Docker](docker.md), as it ensures compatible versions of the aforementioned software are available to backup-utils.
 
-We encourage the use of [Docker](docker.md), as it ensures compatible versions of the aforementioned software are available to backup-utils.
+The parallel backup and restore feature will require [GNU awk][10] and [moreutils][9] to be installed.
 
 The backup host must be able to establish outbound network connections to the GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise Server.
 

share/github-backup-utils/version

@@ -1 +1 @@
-3.10.0
+3.10.1

test/testlib.sh

@@ -43,7 +43,7 @@ export GHE_BACKUP_CONFIG GHE_DATA_DIR GHE_REMOTE_DATA_DIR GHE_REMOTE_ROOT_DIR
 
 # The default remote appliance version. This may be set in the environment prior
 # to invoking tests to emulate a different remote vm version.
-: ${GHE_TEST_REMOTE_VERSION:=3.8.0.rc1}
+: ${GHE_TEST_REMOTE_VERSION:=3.10.0.rc1}
 export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the