diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-02-04 15:15:23 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-02-04 15:15:23 -0600 |
| commit | 48dcaa60e6d5e1b1874f732e27abac8aeb618f4b (patch) | |
| tree | f3a6d0b034cbfd94a1817b56e30a63144883a3d8 /nova | |
| parent | b65e994d9597f0a989b30eafc7a51bc34c4c361f (diff) | |
| parent | 40715cfde9f20ede97b696c3c3ebbbf67aaa8243 (diff) | |
Merge from trunk
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/version.py | 4 | ||||
| -rw-r--r-- | nova/volume/api.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/version.py b/nova/version.py index 48ac84a03..c3ecc2245 100644 --- a/nova/version.py +++ b/nova/version.py @@ -21,10 +21,10 @@ except ImportError: 'revision_id': 'LOCALREVISION', 'revno': 0} -NOVA_VERSION = ['2011', '1'] +NOVA_VERSION = ['2011', '2'] YEAR, COUNT = NOVA_VERSION -FINAL = True # This becomes true at Release Candidate time +FINAL = False # This becomes true at Release Candidate time def canonical_version_string(): diff --git a/nova/volume/api.py b/nova/volume/api.py index 0bcd8a3b0..478c83486 100644 --- a/nova/volume/api.py +++ b/nova/volume/api.py @@ -45,7 +45,7 @@ class API(base.Base): LOG.warn(_("Quota exceeeded for %(pid)s, tried to create" " %(size)sG volume") % locals()) raise quota.QuotaError(_("Volume quota exceeded. You cannot " - "create a volume of size %s") % size) + "create a volume of size %sG") % size) options = { 'size': size, |