summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2011-10-28 12:20:55 -0700
committerJoe Gordon <jogo@cloudscaling.com>2011-10-29 00:07:45 -0700
commitfbe692f9d727ff1f96b960794f637f26a85a61cb (patch)
tree16c806ca68231a57c21822bfa3276ab2603776ab
parent6ebc0ac3248b6ec7f1a221b4dae5f326406ab614 (diff)
downloadnova-fbe692f9d727ff1f96b960794f637f26a85a61cb.tar.gz
nova-fbe692f9d727ff1f96b960794f637f26a85a61cb.tar.xz
nova-fbe692f9d727ff1f96b960794f637f26a85a61cb.zip
fixes bug 883233.
Added to Authors fix typo in scheduler/driver.py assert_compute_node_has_enough_memory. Change-Id: I21a17c9f2d147febd0035c6f396b6956696627da
-rw-r--r--Authors1
-rw-r--r--nova/scheduler/driver.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/Authors b/Authors
index fab2ef03a..fc0edd3af 100644
--- a/Authors
+++ b/Authors
@@ -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,