merge from trunk

This commit is contained in:
William Wolf
2011-09-16 09:28:51 -04:00

View File

@@ -506,7 +506,7 @@ class FixedIpInvalid(Invalid):
message = _("Fixed IP address %(address)s is invalid.")
class NoMoreFixedIps(Error):
class NoMoreFixedIps(NovaException):
message = _("Zero fixed ips available.")