From c9842f6432db6748c80168c47b3bd9f7094c9634 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Tue, 25 Oct 2016 15:42:16 -0600
Subject: [PATCH 1/2] Update ChangeLog with PRs merged since last release

---
 ChangeLog | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 62f6b9c..785189d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,24 @@
-Version 2106.08.16:
+Version 2016.10.25:
+    * Update AUTHORS.rst with new contributors (rallytime) #978
+    * Let's start detecting the upcoming Debian 9 (Stretch) (lhost) #975
+    * FreeBSD: set _SALT_ETC_DIR directory to match ports (eradman) #970
+    * Update OpenBSD 6.0+ provisioning (eradman) #969
+    * adds supports for Cumulus Linux (plumbis) #967
+    * Run "pip install -U futures" for SmartOS git install (rallytime) #966
+    * Change /pkg/rpm/ to /pkg/deb/ in install_ubuntu_git_post func (rallytime) #965
+    * SUSE: Refactor systemsmanagement_saltstack repo checks to be DRY (rallytime) #964
+    * Fix detection of EPEL repository with not-expired metadata (sp1r) #963
+    * Display warning message about deprecating the `-G` option (vutny) #958
+    * Allow correct salt paths to be used when -c is passed (justinta) #955
+    * Fix issues with replacing configs when python3 is default in os. (fizmat) #954
+    * Remove m2crypto package installs (rallytime) #951
+    * Try to install SP4 packages on SLE 11 when SP version is older (rallytime) #950
+    * Add python-futures package to install_centos_git_deps (rallytime) #948
+    * Add /etc/portage/package.accept_keywords to CONFIG_PROTECT_MASK (rallytime) #947
+    * Deprecate `-G` option: use `https` scheme for GitHub by default (vutny) #945
+    * [SECURITY] Properly handle GnuPG keys for APT repositories (vutny) #940
+
+Version 2016.08.16:
     * Ubuntu git mode: install all deps from SaltStack corp repo by default. (vutny) #936
 
 Version 2016.08.15:

From 290e7ce2f3fcba622fe2345110c5c8b239148eff Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Tue, 25 Oct 2016 15:43:17 -0600
Subject: [PATCH 2/2] Update script version

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index a747021..7bb9dd5 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -18,7 +18,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2016.08.16"
+__ScriptVersion="2016.10.25"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"