Fix return interface defaults

salt/client.py

@@ -60,7 +60,7 @@ class LocalClient(object):
         except:
             raise SaltClientError('Failed to read in the salt root key')
 
-    def cmd(self, tgt, fun, arg=(), timeout=5, expr_form='glob', ret='master'):
+    def cmd(self, tgt, fun, arg=(), timeout=5, expr_form='glob', ret=''):
         '''
         Execute a salt command and return.
         '''
@@ -185,7 +185,7 @@ class LocalClient(object):
                 'exsel': self._check_facter_minions
                 }[expr_form](expr)
             
-    def pub(self, tgt, fun, arg=(), expr_form='glob', ret='master'):
+    def pub(self, tgt, fun, arg=(), expr_form='glob', ret=''):
         '''
         Take the required arguemnts and publish the given command.
         Arguments:

salt/minion.py

@@ -267,9 +267,9 @@ class Minion(object):
                     + ' exception: ' + str(exc))
             ret['return'] = exc
         ret['jid'] = data['jid']
-        if data['return']:
+        if data['ret']:
             try:
-                self.returners[data['return']](ret)
+                self.returners[data['ret']](ret)
             except Exception as exc:
                 self.opts['logger'].error('The return failed for job'\
                     + data['jid'] + ' ' + exc)