diff options
| author | Adam Johnson <adjohn@gmail.com> | 2011-07-26 09:41:55 +0900 |
|---|---|---|
| committer | Adam Johnson <adjohn@gmail.com> | 2011-07-26 09:41:55 +0900 |
| commit | a9b10f32aeb9794e1c7ea80e1794d71876997cb1 (patch) | |
| tree | b0c727d73f369a3e168144a622d7e1cd7f89d41a /nova/compute | |
| parent | 4c9ca0962e98c33b54d289c5ac1cd0dc79d36b51 (diff) | |
| parent | 83033f69e19832dc50fccf5b833189f0c4e8de63 (diff) | |
fixing merge conflict
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 9994e5724..c49c0d95c 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -127,7 +127,7 @@ class API(base.Base): quota_metadata = quota.allowed_metadata_items(context, num_metadata) if quota_metadata < num_metadata: pid = context.project_id - msg = _("Quota exceeeded for %(pid)s, tried to set " + msg = _("Quota exceeded for %(pid)s, tried to set " "%(num_metadata)s metadata properties") % locals() LOG.warn(msg) raise quota.QuotaError(msg, "MetadataLimitExceeded") @@ -138,7 +138,7 @@ class API(base.Base): for k, v in metadata.iteritems(): if len(k) > 255 or len(v) > 255: pid = context.project_id - msg = _("Quota exceeeded for %(pid)s, metadata property " + msg = _("Quota exceeded for %(pid)s, metadata property " "key or value too long") % locals() LOG.warn(msg) raise quota.QuotaError(msg, "MetadataLimitExceeded") @@ -165,7 +165,7 @@ class API(base.Base): instance_type) if num_instances < min_count: pid = context.project_id - LOG.warn(_("Quota exceeeded for %(pid)s," + LOG.warn(_("Quota exceeded for %(pid)s," " tried to run %(min_count)s instances") % locals()) if num_instances <= 0: message = _("Instance quota exceeded. You cannot run any " |