From c56bfeef2d985bdd8857881d4664ee7f6a771241 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Fri, 28 Oct 2011 12:20:55 -0700
Subject: [PATCH] fixes bug 883233. Added to Authors fix typo in
 scheduler/driver.py assert_compute_node_has_enough_memory.

Change-Id: I21a17c9f2d147febd0035c6f396b6956696627da
---
 Authors                  | 1 +
 nova/scheduler/driver.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

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,