From 2ba412d91f2bba27244f68b78ada9e20b66efbb3 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 15 Dec 2015 14:48:03 -0500
Subject: [PATCH] Update to Salt 2015.8.1

---
 .travis/install_salt     | 8 ++++----
 android-dependencies.sls | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis/install_salt b/.travis/install_salt
index 49d4d604..a38d605b 100755
--- a/.travis/install_salt
+++ b/.travis/install_salt
@@ -14,14 +14,14 @@ install_salt () {
     if [ "${OS_NAME}" = "linux" ]; then
         printf "$0: installing salt for Linux\n"
         # Use Trusty (Ubuntu 14.04) on Travis
-        curl https://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2015.5.8/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-        printf 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2015.5.8 trusty main\n' | sudo tee -a /etc/apt/sources.list >/dev/null
+        curl https://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2015.8.1/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+        printf 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2015.8.1 trusty main\n' | sudo tee -a /etc/apt/sources.list >/dev/null
         sudo apt-get -y update
-        sudo apt-get -y install salt-minion=2015.5.8+ds-1
+        sudo apt-get -y install salt-minion=2015.8.1+ds-1
     elif [ "${OS_NAME}" = "osx" ]; then
         printf "$0: installing salt for Mac OS X\n"
         brew update
-        brew install https://raw.githubusercontent.com/Homebrew/homebrew/86efec6695b019762505be440798c46d50ebd738/Library/Formula/saltstack.rb
+        brew install https://raw.githubusercontent.com/Homebrew/homebrew/74bc5ef500fe2242258b672a5e96c5429fc4792f/Library/Formula/saltstack.rb
     else
         printf >&2 "$0: unknown operating system ${OS_NAME}\n"
         exit 1
diff --git a/android-dependencies.sls b/android-dependencies.sls
index c02f9ddb..af16381a 100644
--- a/android-dependencies.sls
+++ b/android-dependencies.sls
@@ -31,7 +31,8 @@ android-sdk:
     - source: http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
     - source_hash: sha512=96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
     - archive_format: tar
-    - archive_user: servo # 2015.8 moves these to the standard user and group parameters
+    - user: servo
+    - group: servo
     - if_missing: /home/servo/android-sdk_r24.4.1-linux.tgz
   cmd.wait:
     # The arguments to --filter are from running 'android list sdk'