From 4a7e44f7b6af2a6c1d57dfae8b6e0bd13f721135 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 11 Sep 2014 20:48:37 +0100
Subject: [PATCH 1/5] Also match v2014.7

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index ebce316..c636055 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1157,7 +1157,7 @@ __git_clone_and_checkout() {
         fi
     else
         __SHALLOW_CLONE="${BS_FALSE}"
-        if [ "$(echo "$GIT_REV" | sed 's/^.*\(v[[:digit:]]\{1,4\}\.[[:digit:]]\{1,2\}\.[[:digit:]]\{1,2\}\).*$/MATCH/')" = "MATCH" ]; then
+        if [ "$(echo "$GIT_REV" | sed 's/^.*\(v[[:digit:]]\{1,4\}\.[[:digit:]]\{1,2\}\.[[:digit:]]\{1,2\}\)\?.*$/MATCH/')" = "MATCH" ]; then
             echoinfo "Git revision matches a Salt version tag"
             # Let's try shallow cloning to speed up.
             # Test for "--single-branch" option introduced in git 1.7.10, the minimal version of git where the shallow

From f13ff3500e8ae3ad4671b98e2502412d2fc92f39 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 11 Sep 2014 20:49:38 +0100
Subject: [PATCH 2/5] Update changes log

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

diff --git a/ChangeLog b/ChangeLog
index 114539c..95c9a3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Version 2014.xx.xx:
+	* Fixed salt tag version matching to also accept, for example, v2014.7. #464
+
 Version 2014.09.09:
 	* Distro Support Fixes:
 		* Updated the URL for EPEL 7

From 6e67f05642006cbe87876c48af52cbc5db195989 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 24 Sep 2014 15:50:10 +0100
Subject: [PATCH 3/5] The EPEL package is now on 7.2

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index c636055..67d00b8 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2517,7 +2517,7 @@ __install_epel_repository() {
     elif [ "$DISTRO_MAJOR_VERSION" -eq 6 ]; then
         rpm -Uvh --force "http://download.fedoraproject.org/pub/epel/6/${EPEL_ARCH}/epel-release-6-8.noarch.rpm" || return 1
     elif [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then
-        rpm -Uvh --force "http://download.fedoraproject.org/pub/epel/7/${EPEL_ARCH}/e/epel-release-7-1.noarch.rpm" || return 1
+        rpm -Uvh --force "http://download.fedoraproject.org/pub/epel/7/${EPEL_ARCH}/e/epel-release-7-2.noarch.rpm" || return 1
     else
         echoerror "Failed add EPEL repository support."
         return 1

From 3ea7d3374dc91024b161dd760f46839f2c2eb4fe Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 24 Sep 2014 15:52:17 +0100
Subject: [PATCH 4/5] Update changes log

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 95c9a3c..74e1a23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Version 2014.xx.xx:
 	* Fixed salt tag version matching to also accept, for example, v2014.7. #464
+	* Fix the EPEL 7 URL since epel-release is now 7.2
 
 Version 2014.09.09:
 	* Distro Support Fixes:

From 9f666593140c3505fd53ab2eafa7a09d7b0e7167 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 24 Sep 2014 15:54:49 +0100
Subject: [PATCH 5/5] Bump version for stable release

---
 ChangeLog         | 2 +-
 bootstrap-salt.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74e1a23..89fe3e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Version 2014.xx.xx:
+Version 2014.09.24:
 	* Fixed salt tag version matching to also accept, for example, v2014.7. #464
 	* Fix the EPEL 7 URL since epel-release is now 7.2
 
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 67d00b8..b7aec9c 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -17,7 +17,7 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
-__ScriptVersion="2014.09.09"
+__ScriptVersion="2014.09.24"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================