Merge branch 'develop' into stable for v2014.09.25

saltstack · Sep 25, 2014 · bf9364a · bf9364a
2 parents b549ca9 + e6f9aec
commit bf9364a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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:

diff --git 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

diff --git 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.