x/gantt
Code Issues Proposed changes

Merge from trunk, conflict resolution and merge prop fixes

Browse Source
This commit is contained in:
Cerberus
2011-03-03 13:13:15 -06:00
parent 0f77950038 4f00a65f68
commit a4931fe8ae
18 changed files with 349 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/test_xenapi.py
View File

@@ -233,7 +233,7 @@ class XenAPIVMTestCase(test.TestCase):
vm = vms[0]
# Check that m1.large above turned into the right thing.
instance_type = instance_types.INSTANCE_TYPES['m1.large']
instance_type = db.instance_type_get_by_name(conn, 'm1.large')
mem_kib = long(instance_type['memory_mb']) << 10
mem_bytes = str(mem_kib << 10)
vcpus = instance_type['vcpus']