Merge branch 'master' into snh/audit-size

Author: snh

debian/changelog

@@ -1,3 +1,17 @@
+github-backup-utils (2.11.3) UNRELEASED; urgency=medium
+
+  * Update argument parsing and help/usage consistency #320
+  * Fix failures variable #353
+  * Remove other snapshot contents before removing the "incomplete" file #358
+  * Backup and restore the management console password #361
+  * Check for git before allowing SSH multiplex #362
+  * Cleanup SSH multiplexing on exit #363
+  * Filter cluster nodes by role during backup and restore #367
+  * Optimise route generation and finalisation during cluster restores of pages #369
+  * Allow extra rsync options to override default options #370
+
+ -- Colin Seymour <[email protected]>  Wed, 28 Feb 2018 16:32:07 +0000
+
 github-backup-utils (2.11.2) UNRELEASED; urgency=medium
 
   * Allow the restoration of configuration to Cluster #347

share/github-backup-utils/ghe-restore-es-rsync

@@ -55,6 +55,11 @@ elif [ "$GHE_VERSION_MAJOR" -gt 1 ]; then
         "$snapshot_dir/elasticsearch/" \
         "$(ssh_host_part "$GHE_HOSTNAME"):$GHE_REMOTE_DATA_USER_DIR/elasticsearch-restore" 1>&3
 
+    # restoring in >=2.14 will remove incompatible indices created with 1.x.
+    if [ "$GHE_VERSION_MAJOR" -eq 2 ] && [ "$GHE_VERSION_MINOR" -ge 14 ]; then
+        ghe-ssh "$GHE_HOSTNAME" -- "sudo /usr/local/share/enterprise/ghe-es-remove-1x-indices"
+    fi
+
 # restoring v11.10.x ES snapshot into a v11.10.x appliance
 else
     # Use GNU tar on BSDs.

share/github-backup-utils/version

@@ -1 +1 @@
-2.11.2
+2.11.3