merge from trunk

1 files changed, 1 insertions, 1 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 48d576931..000e834f0 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -873,7 +873,7 @@ class InstanceTypeCommands(object):
         try:
             instance_types.create(name, memory, vcpus, local_gb,
                                   flavorid, swap, rxtx_quota, rxtx_cap)
-        except exception.InvalidInputException:
+        except exception.InvalidInput:
             print "Must supply valid parameters to create instance_type"
             print e
             sys.exit(1)