From f71274e54166db9fe8962ca9bfcd8e4089bf1481 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Fri, 24 Jun 2016 16:23:22 -0600
Subject: [PATCH 1/2] Update release changelog

---
 ChangeLog | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 30b0b9d..abcec55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Version 2016.06.24:
+    * Save invocation command and arguments into variables. (jfindlay) #885
+    * Update the authors list with new contributors. (rallytime) #884
+    * Add option to make setup.py install quiet. (nasenbaer13) #865
+    * Fix lint. (jfindlay) #881
+    * Add -R option to allow a custom repo URL. (rallytime) #877
+    * Exclude path of script when called from another dir. (l2ol33rt) #871
+    * Print invocation info. (jfindlay) #869
+    * Always refresh the Arch Linux keyring if needed. (cachedout) #868
+    * Ubuntu 16.04 LTS Xenial Support. (notpeter) #852
+    * Install Salt packages from repo.saltstack.com on Debian 7 "Wheezy". (vutny) #864
+    * Drop support for Debian 6 old-old-stable "squeeze": reached end-of-life. (vutny) #860
+    * Removed ubuntu version restriction for apt-get update. (marccardinal) #859
+    * Fix bootstrapping from git on Debian 8 by installing latest `tornado` via pip. (vutny) #828
+    * Add the ability to override master and/or minion configs from CLI. (rallytime) #841
+    * Don't sleep 11 seconds if the user allowed overwrite of config files. (poelzi) #832
+
 Version 2016.05.11:
     * Only overwrite the minion config file if '-C' is passed. Otherwise, preserve it. (rallytime) #848
 

From 40092e5b2bbe1969e9052b9a904e16cbfed51ab6 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Fri, 24 Jun 2016 16:25:50 -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 fa2d490..624b881 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -18,7 +18,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2016.05.11"
+__ScriptVersion="2016.06.24"
 __ScriptName="$(basename "${0}")"
 __ScriptFullName="${0}"
 __ScriptArgs="${*}"