Merge branch 'master' into lildude/docs-update-reorg

Author: lildude

bin/ghe-restore

@@ -448,8 +448,8 @@ else
   ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
 fi
 
-echo "Completed restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
+echo "Restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT finished."
 
-if ! $cluster; then
-  echo "Visit https://$hostname/setup/settings to review appliance configuration."
+if ! $instance_configured; then
+  echo "To complete the restore process, please visit https://$hostname/setup/settings to review and save the appliance configuration."
 fi

debian/changelog

@@ -1,3 +1,10 @@
+github-backup-utils (2.11.4) UNRELEASED; urgency=medium
+
+  * Move check for git for ssh muxing into ghe-ssh #378
+  * Make it clear the settings need to be applied after restoring to an unconfigured instance  #381
+
+ -- Colin Seymour <[email protected]>  Tue, 27 Mar 2018 13:20:18 +0000
+
 github-backup-utils (2.11.3) UNRELEASED; urgency=medium
 
   * Update argument parsing and help/usage consistency #320

share/github-backup-utils/version

@@ -1 +1 @@
-2.11.3
+2.11.4