Merge pull request #25175 from rallytime/bp-25020

Back-port #25020 to 2015.5
saltstack · Jul 6, 2015 · a9404ae · a9404ae
2 parents c70fec6 + da2e170
commit a9404ae
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/runners/doc.py b/salt/runners/doc.py
@@ -73,7 +73,7 @@ def execution():
         print exc
         return []
 
-    i = itertools.chain.from_iterable([i.items() for i in six.itervalues(docs)])
+    i = itertools.chain.from_iterable([six.iteritems(docs['ret'])])
     ret = dict(list(i))
 
     return ret