[salt/f19] Update to version 2014.1.10

[Erik Johnson]

commit d611a188beb870ccfa200ef3398ffc3577243e44
Author: Erik Johnson <erik at saltstack.com>
Date:   Mon Aug 4 16:17:26 2014 -0500

    Update to version 2014.1.10

 .gitignore          |    1 +
 salt-master.service |    2 +-
 salt-minion         |   13 ++++++++++++-
 salt.spec           |    9 +++++++--
 sources             |    2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 167f5a9..aec05af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
 /SaltTesting-2014.4.24.tar.gz
 /salt-2014.1.5.tar.gz
 /salt-2014.1.7.tar.gz
+/salt-2014.1.10.tar.gz
diff --git a/salt-master.service b/salt-master.service
index 65944f3..ddfdb24 100644
--- a/salt-master.service
+++ b/salt-master.service
@@ -3,7 +3,7 @@ Description=The Salt Master Server
 After=syslog.target network.target
 
 [Service]
-Type=Notify
+Type=notify
 ExecStart=/usr/bin/salt-master
 
 [Install]
diff --git a/salt-minion b/salt-minion
index a91ab7b..214f895 100644
--- a/salt-minion
+++ b/salt-minion
@@ -81,6 +81,7 @@ stop() {
     if [ -f $SUSE_RELEASE ]; then
         killproc -TERM $SALTMINION
         rc_status -v
+        RETVAL=$?
     elif [ -f $DEBIAN_VERSION ]; then
         # Added this since Debian's start-stop-daemon doesn't support spawned processes
         if ps -ef | grep "$PYTHON $SALTMINION" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
@@ -92,8 +93,18 @@ stop() {
         fi
     else
         killproc $PROCESS
+        RETVAL=$?
+        # tidy up any rogue processes:
+        PROCS=`ps -ef | grep "$SALTMINION" | grep -v grep | awk '{print $2}'`
+        if [ -n "$PROCS" ]; then
+            kill $PROCS &> /dev/null
+            sleep 1
+            PROCS=`ps -ef | grep "$SALTMINION" | grep -v grep | awk '{print $2}'`
+            if [ -n "$PROCS" ]; then
+                kill -9 $PROCS &> /dev/null
+            fi
+        fi
     fi
-    RETVAL=$?
     echo
 }
 
diff --git a/salt.spec b/salt.spec
index 51c248e..b33d505 100644
--- a/salt.spec
+++ b/salt.spec
@@ -15,8 +15,8 @@
 %define _salttesting_ver 2014.4.24
 
 Name: salt
-Version: 2014.1.7
-Release: 3%{?dist}
+Version: 2014.1.10
+Release: 1%{?dist}
 Summary: A parallel remote execution system
 
 Group:   System Environment/Daemons
@@ -110,6 +110,7 @@ Requires(postun): systemd-units
 %endif
 
 BuildRequires: systemd-units
+Requires:      systemd-python
 
 %endif
 
@@ -125,6 +126,7 @@ servers, handle them quickly and through a simple and manageable interface.
 Summary: Management component for salt, a parallel remote execution system 
 Group:   System Environment/Daemons
 Requires: salt = %{version}-%{release}
+Requires: systemd-python
 
 %description -n salt-master 
 The Salt master is the central server to which all minions connect.
@@ -326,6 +328,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 4 2014 Erik Johnson <erik at saltstack.com> - 2014.1.10-1
+- Update to bugfix release 2014.1.10
+
 * Thu Jul 10 2014 Erik Johnson <erik at saltstack.com> - 2014.1.7-3
 - Add logrotate script
 
diff --git a/sources b/sources
index 3e3bd90..f00e508 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9ab50536f46389983888771d4e735d56  salt-2014.1.7.tar.gz
+ff6dff1ce949ab176745a30bde17e81d  salt-2014.1.10.tar.gz
 4e91e01fc1819c783097dd484947442d  SaltTesting-2014.4.24.tar.gz