From c8cee3b122c57e557d195b7c16d9d621e8b78adb Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 24 Sep 2014 16:45:20 +0100
Subject: [PATCH 1/3] Remove `.sh.sh` references. Fixes #465

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 8184ac3..0584e91 100644
--- a/README.rst
+++ b/README.rst
@@ -107,8 +107,8 @@ To install a specific branch from a git fork:
 
 .. code:: console
 
-  curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
-  sudo sh install_salt.sh.sh -g https://github.com/myuser/salt.git git mybranch
+  curl -o install_salt.sh -L https://bootstrap.saltstack.com
+  sudo sh install_salt.sh -g https://github.com/myuser/salt.git git mybranch
 
 
 Installing via an Insecure One-Liner

From 4daf78561c2e14baedd8d177f7ea743b20ea8a12 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 25 Sep 2014 16:35:39 +0100
Subject: [PATCH 2/3] Properly detect Amazon AMI's >= 2014.9. Fixes #468.

---
 bootstrap-salt.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b7aec9c..1823372 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -774,6 +774,10 @@ __gather_linux_system_info() {
                 rv="$(__unquote_string "$(grep '^VERSION_ID=' /etc/os-release | sed -e 's/^VERSION_ID=\(.*\)$/\1/g')")"
                 [ "${rv}" != "" ] && v=$(__parse_version_string "$rv") || v=""
                 case $(echo "${nn}" | tr '[:upper:]' '[:lower:]') in
+                    amzn        )
+                        # Amazon AMI's after 2014.9 match here
+                        n="Amazon Linux AMI"
+                        ;;
                     arch        )
                         n="Arch Linux"
                         v=""  # Arch Linux does not provide a version.

From e6f9aec40712d8b529183fc03507fbdec6e5d0a6 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 25 Sep 2014 16:37:42 +0100
Subject: [PATCH 3/3] Update changes log

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

diff --git a/ChangeLog b/ChangeLog
index 89fe3e3..44074a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,5 @@
-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
+Version 2014.09.25:
+	* Properly detect Amazon AMI's >= 2014.9. #468
 
 Version 2014.09.09:
 	* Distro Support Fixes: