From b8e3da692b52c7e731dde7ec4bb22162716fc684 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Jan 2020 17:50:34 +0000 Subject: [PATCH] Update version, ChangeLog and AUTHORS for stable merge --- AUTHORS.rst | 1 + ChangeLog | 4 ++++ bootstrap-salt.sh | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 3fc7c87..b3a9322 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -86,6 +86,7 @@ Jorge Schrauwen sjorge sjorge@blackdot.be Juan A. Moyano wincus wincus.public@gmail.com Justin Anderson justinta justin.ta@outlook.com Justin Findlay jfindlay jfindlay@gmail.com + kgbsd Karl Grzeszczak karlgrz Kenneth Wilke KennethWilke Kevin Quinn kevinquinnyo kevin.quinn@totalserversolutions.com diff --git a/ChangeLog b/ChangeLog index dd36fa2..07bc592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Version TBD (In Progress on the Develop Branch): +Version 2020.01.21: + * FreeBSD fixes (kgbsd) #1376 + * Fix macOS support (s0undt3ch) #1397 + Version 2019.11.04: * Fix busybox mktemp compatibility (stanzgy) #1369 * Install debian 10 packages on debian 10 instead of 9 (kiemlicz) #1375 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f8c0511..3c6131d 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2019.11.04" +__ScriptVersion="2020.01.21" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"