Merge remote-tracking branch 'upstream/develop' into sam_raet_20

salt/minion.py

@@ -805,6 +805,8 @@ class Minion(MinionBase):
                 name=data['jid']
             )
         process.start()
+        if not sys.platform.startswith('win'):
+            process.join()
 
     @classmethod
     def _thread_return(cls, minion_instance, opts, data):

salt/modules/iptables.py

@@ -28,9 +28,9 @@ def _iptables_cmd(family='ipv4'):
     Return correct command based on the family, eg. ipv4 or ipv6
     '''
     if family == 'ipv6':
-        return 'ip6tables'
+        return salt.utils.which('ip6tables')
     else:
-        return 'iptables'
+        return salt.utils.which('iptables')
 
 
 def _conf(family='ipv4'):

salt/states/iptables.py

@@ -325,7 +325,7 @@ def insert(name, family='ipv4', **kwargs):
             if kwargs['save']:
                 __salt__['iptables.save'](filename=None, family=family)
                 ret['comment'] = ('Set and Saved iptables rule for {0} to: '
-                                  '{1} for {2}'.format(name, command.strip(), family))
+                                  '{1} for {2}').format(name, command.strip(), family)
         return ret
     else:
         ret['result'] = False

salt/states/pkg.py

@@ -357,7 +357,9 @@ def installed(
         Skip the GPG verification check for the package to be installed
 
     skip_suggestions
-        Force strict package naming. Disable lookup of package alternatives
+        Force strict package naming. Disables lookup of package alternatives.
+
+        .. versionadded:: 2014.1.1
 
     version
         Install a specific version of a package. This option is ignored if

salt/utils/event.py

@@ -323,7 +323,7 @@ class SaltEvent(object):
         if not self.cpush:
             self.connect_pull(timeout=timeout)
 
-        data['_stamp'] = datetime.datetime.now().isoformat('_')
+        data['_stamp'] = datetime.datetime.now().isoformat()
 
         tagend = ''
         if len(tag) <= 20:  # old style compatible tag