valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2014.7' into develop

Browse Source
This commit is contained in:
Colton Myers 2014-08-07 11:07:21 -06:00
commit aa78ebbc32
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/runners/manage.py
View File

@ -235,7 +235,7 @@ def versions():
version_status = {}
master_version = salt.version.SaltStackVersion.parse(salt.__version__)
master_version = salt.version.__saltstack_version__
for minion in minions:
minion_version = salt.version.SaltStackVersion.parse(minions[minion])
@ -243,10 +243,10 @@ def versions():
if ver_diff not in version_status:
version_status[ver_diff] = {}
version_status[ver_diff][minion] = str(minion_version)
version_status[ver_diff][minion] = minion_version.string
# Add version of Master to output
version_status[2] = str(master_version)
version_status[2] = master_version.string
ret = {}
for key in version_status: