diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-10-30 03:40:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-10-30 03:40:25 +0000 |
| commit | 5b8133a83939fd552b569c4b034cef43907ea1ce (patch) | |
| tree | 9825bb71c10cd2c95e67ecc92110227ddb80c06d | |
| parent | 355712b930720e484711bb810d83a638b5a9cf8b (diff) | |
| parent | fbe692f9d727ff1f96b960794f637f26a85a61cb (diff) | |
| download | nova-5b8133a83939fd552b569c4b034cef43907ea1ce.tar.gz nova-5b8133a83939fd552b569c4b034cef43907ea1ce.tar.xz nova-5b8133a83939fd552b569c4b034cef43907ea1ce.zip | |
Merge "fixes bug 883233. Added to Authors fix typo in scheduler/driver.py assert_compute_node_has_enough_memory."
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | nova/scheduler/driver.py | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -55,6 +55,7 @@ Jason Koelker <jason@koelker.net> Jay Pipes <jaypipes@gmail.com> Jesse Andrews <anotherjesse@gmail.com> Jimmy Bergman <jimmy@sigint.se> +Joe Gordon <jogo@cloudscaling.com> Joe Heck <heckj@mac.com> Joel Moore <joelbm24@gmail.com> Johannes Erdfelt <johannes.erdfelt@rackspace.com> diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 577503cd8..7c79d28c9 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -382,7 +382,8 @@ class Scheduler(object): if avail <= mem_inst: instance_id = ec2utils.id_to_ec2_id(instance_ref['id']) reason = _("Unable to migrate %(instance_id)s to %(dest)s: " - "Lack of disk(host:%(avail)s <= instance:%(mem_inst)s)") + "Lack of memory(host:%(avail)s <= " + "instance:%(mem_inst)s)") raise exception.MigrationError(reason=reason % locals()) def assert_compute_node_has_enough_disk(self, context, |