[salt/el5] Updated to bugfix release 0.17.2

Erik Johnson terminalmage at fedoraproject.org
Tue Nov 19 02:35:29 UTC 2013


commit 9a7a125ae54d1e23b4da1058a296a6825d4e045c
Author: Erik Johnson <erik at saltstack.com>
Date:   Mon Nov 18 19:57:59 2013 -0600

    Updated to bugfix release 0.17.2

 .gitignore  |    2 ++
 salt-minion |    8 ++++----
 salt.spec   |    7 +++++--
 sources     |    4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fa08ed5..73631e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@
 /SaltTesting-0.5.1.tar.gz
 /salt-0.17.0.tar.gz
 /salt-0.17.1.tar.gz
+/salt-0.17.2.tar.gz
+/SaltTesting-0.5.3.tar.gz
diff --git a/salt-minion b/salt-minion
index 2ef39c9..e8cd25f 100644
--- a/salt-minion
+++ b/salt-minion
@@ -65,13 +65,13 @@ start() {
         fi
     else
         if [ $(pidofproc $PROCESS) ]; then
-	          RETVAL=$?
-	          echo -n "already running"
+            RETVAL=$?
+            echo -n "already running"
         else
-	          daemon --check $SERVICE $SALTMINION -d $MINION_ARGS
-	          RETVAL=$?
+            daemon --check $SERVICE $SALTMINION -d $MINION_ARGS 
         fi
     fi
+    RETVAL=$?
     echo
     return $RETVAL
 }
diff --git a/salt.spec b/salt.spec
index 69786f4..5b466e0 100644
--- a/salt.spec
+++ b/salt.spec
@@ -12,10 +12,10 @@
 %{!?pythonpath: %global pythonpath %(%{__python} -c "import os, sys; print(os.pathsep.join(x for x in sys.path if x))")}
 
 %define _salttesting SaltTesting
-%define _salttesting_ver 0.5.1
+%define _salttesting_ver 0.5.3
 
 Name: salt
-Version: 0.17.1
+Version: 0.17.2
 Release: 1%{?dist}
 Summary: A parallel remote execution system
 
@@ -318,6 +318,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Nov 18 2013 Erik Johnson <erik at saltstack.com> - 0.17.2-1
+- Update to bugfix release 0.17.2
+
 * Thu Oct 17 2013 Erik Johnson <erik at saltstack.com> - 0.17.1-1
 - Update to bugfix release 0.17.1
 
diff --git a/sources b/sources
index acd2b31..9c35745 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-234eb968862f54f58ccd7b7ea2e3b3d9  salt-0.17.1.tar.gz
-f4a6a5d590a2855b89060682117fb69e  SaltTesting-0.5.1.tar.gz
+cb61ca768847c2f4d0844fef651a89d1  salt-0.17.2.tar.gz
+75b1fdd52e8ffd9368109ac2d7b5f57c  SaltTesting-0.5.3.tar.gz


More information about the scm-commits mailing list