summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
Diffstat (limited to 'nova')
-rw-r--r--nova/version.py4
-rw-r--r--nova/volume/api.py2
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,