OpenStack Compute (nova)

Merge lp:~vishvananda/nova/fix-swap-manage-ms into lp:~hudson-openstack/nova/milestone-proposed

  1. fix-swap-manage-ms
  2. Merge into milestone-proposed
Proposed by Vish Ishaya
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1191
Merged at revision: 1196
Proposed branch: lp:~vishvananda/nova/fix-swap-manage-ms
Merge into: lp:~hudson-openstack/nova/milestone-proposed
Diff against target: 12 lines (+1/-1)
1 file modified
bin/nova-manage (+1/-1)
To merge this branch: bzr merge lp:~vishvananda/nova/fix-swap-manage-ms
Reviewer Review Type Date Requested Status
OpenStack release team Pending
Review via email: mp+76182@code.launchpad.net

Description of the change

Fix the display of swap units in nova manage.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/nova-manage'
2--- bin/nova-manage 2011-09-20 09:27:11 +0000
3+++ bin/nova-manage 2011-09-20 10:11:48 +0000
4@@ -1692,7 +1692,7 @@
5 def _print_instance_types(self, name, val):
6 deleted = ('', ', inactive')[val["deleted"] == 1]
7 print ("%s: Memory: %sMB, VCPUS: %s, Storage: %sGB, FlavorID: %s, "
8- "Swap: %sGB, RXTX Quota: %sGB, RXTX Cap: %sMB%s") % (
9+ "Swap: %sMB, RXTX Quota: %sGB, RXTX Cap: %sMB%s") % (
10 name, val["memory_mb"], val["vcpus"], val["local_gb"],
11 val["flavorid"], val["swap"], val["rxtx_quota"],
12 val["rxtx_cap"], deleted)

Subscribers

People subscribed via source and target branches