Merge branch '2014.7' into develop

valentinbud · Aug 7, 2014 · aa78ebb · aa78ebb
2 parents 143f655 + eed5339
commit aa78ebb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/salt/runners/manage.py b/salt/runners/manage.py
@@ -235,18 +235,18 @@ 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])
         ver_diff = cmp(minion_version, master_version)
 
         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: