Merge pull request #1513 from wilkystyle/develop

Develop
saltstack · Jun 29, 2012 · 0c66239 · 0c66239
2 parents f922152 + 6805eae
commit 0c66239
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/salt/client.py b/salt/client.py
@@ -833,7 +833,7 @@ def pub(self, tgt, fun, arg=(), expr_form='glob',
             # forms possible
             minions = tgt
         elif not minions:
-            return {'jid': '0',
+            return {'jid': None,
                     'minions': minions}
 
         # Generate the standard keyword args to feed to format_payload
@@ -934,4 +934,3 @@ def function(self, fun, *args, **kwargs):
         func = self.sminion.functions[fun]
         args, kw = salt.minion.detect_kwargs(func, args, kwargs)
         return func(*args, **kw)
-