From 6aed7bbbab10982be850c756d152d34b6ba54fff Mon Sep 17 00:00:00 2001
From: Hao Jiang <jianghao0718@github.com>
Date: Tue, 9 Jun 2020 17:59:06 +0000
Subject: [PATCH] Bump version: 2.21.0 [ci skip]

---
 bin/ghe-host-check                |  2 +-
 debian/changelog                  | 12 ++++++++++++
 script/cibuild                    |  2 +-
 share/github-backup-utils/version |  2 +-
 test/testlib.sh                   |  2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index be77fd315..94f235e51 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -113,7 +113,7 @@ fi
 
 # backup-utils 2.13 onwards limits support to the current and previous two releases
 # of GitHub Enterprise Server.
-supported_minimum_version="2.18.0"
+supported_minimum_version="2.19.0"
 
 if [ "$(version $version)" -ge "$(version $supported_minimum_version)" ]; then
   supported=1
diff --git a/debian/changelog b/debian/changelog
index a3a248779..dfd337512 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+github-backup-utils (2.21.0) UNRELEASED; urgency=medium
+
+  * Introduce option to skip restoring of audit logs #596
+  * Beta: Execute ghe-backup tasks in parallel #597
+  * Beta: Execute ghe-restore tasks in parallel #601
+  * Run repositories restore in parallel #603
+  * Fix mismatched `bm_start` and `bm_end` commands #607
+  * remove rsync restore method used by GHES versions prior to 2.13 #608
+  * Output MySQL backup strategy for clarity during backup and restore #610
+
+ -- Hao Jiang <jianghao0718@github.com>  Tue, 09 Jun 2020 17:59:06 +0000
+
 github-backup-utils (2.19.5) UNRELEASED; urgency=medium
 
   * In legacy mode we should use ghe-import-mysql #581
diff --git a/script/cibuild b/script/cibuild
index 13ccc130b..a486ae960 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -6,7 +6,7 @@ set -e
 # place with this version at the beginning of each test and many commands have
 # conditional logic based on the remote version. Running the suite against
 # different major versions ensures we're covering these conditional paths.
-REMOTE_VERSIONS="2.18.0 2.20.0"
+REMOTE_VERSIONS="2.19.0 2.21.0"
 
 # Enable verbose logging of ssh commands
 export GHE_VERBOSE_SSH=true
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index 83ecbf1d7..db65e2167 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.20.2
+2.21.0
diff --git a/test/testlib.sh b/test/testlib.sh
index a5933cc9d..222b8dd9f 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -42,7 +42,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:=2.20.0}
+: ${GHE_TEST_REMOTE_VERSION:=2.21.0}
 export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the