Merge branch '2015.8' into '2016.3'

No conflicts.
saltstack · Jul 19, 2016 · 3e032dc · 3e032dc
2 parents c3ae64c + 5802103
commit 3e032dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/salt/returners/mysql.py b/salt/returners/mysql.py
@@ -255,6 +255,11 @@ def returner(ret):
     '''
     Return data to a mysql server
     '''
+    # if a minion is returning a standalone job, get a jobid
+    if ret['jid'] == 'req':
+        ret['jid'] = prep_jid(nocache=ret.get('nocache', False))
+        save_load(ret['jid'], ret)
+
     try:
         with _get_serv(ret, commit=True) as cur:
             sql = '''INSERT INTO `salt_returns`

diff --git a/salt/utils/dictupdate.py b/salt/utils/dictupdate.py
@@ -58,7 +58,8 @@ def update(dest, upd, recursive_update=True, merge_lists=False):
         return dest
     else:
         try:
-            dest.update(upd)
+            for k in upd.keys():
+                dest[k] = upd[k]
         except AttributeError:
             # this mapping is not a dict
             for k in upd:

diff --git a/tests/integration/netapi/rest_tornado/test_app.py b/tests/integration/netapi/rest_tornado/test_app.py
@@ -324,6 +324,7 @@ def get_app(self):
         application.event_listener = saltnado.EventListener({}, self.opts)
         return application
 
+    @skipIf(True, 'issue #34753')
     def test_get_no_mid(self):
         response = self.fetch('/minions',
                               method='GET',