From 51257497b6a1c48a094ffe84b190dce48d808ad8 Mon Sep 17 00:00:00 2001 From: rallytime Date: Wed, 11 May 2016 14:19:59 -0600 Subject: [PATCH] Update changelog and version for 2016.05.11 release --- ChangeLog | 3 +++ bootstrap-salt.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3f87574..30b0b9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Version 2016.05.11: + * Only overwrite the minion config file if '-C' is passed. Otherwise, preserve it. (rallytime) #848 + Version 2016.05.10: * Removed libzmq4 and forking-deamon-patch for Opensuse13. (jtand) #840 * Ubuntu 12.04 needs to be updated before installing packages. (jtand) #829 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 2470193..a8f29cc 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.10" +__ScriptVersion="2016.05.11" __ScriptName="bootstrap-salt.sh" #======================================================================================================================