saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #25175 from rallytime/bp-25020

Browse source 
Back-port #25020 to 2015.5
This commit is contained in:
Justin Findlay 2015-07-06 12:53:19 -06:00
commit a9404aea5c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/runners/doc.py
View file

@ -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