summaryrefslogtreecommitdiffstats
path: root/nova/version.py
diff options
context:
space:
mode:
authorRicardo Carrillo Cruz <emaildericky@gmail.com>2011-02-04 11:48:45 +0100
committerRicardo Carrillo Cruz <emaildericky@gmail.com>2011-02-04 11:48:45 +0100
commitc852a4d48d2d7afe0a7d74b5da4d5b31386bbda3 (patch)
tree4b3fdecca5d391e5b2bdb06a4ea9379a13c0337c /nova/version.py
parente35ca46173a5f3bf2d1460c19249fd0bf9f5b538 (diff)
parent7783105dbbfa5c6e6d1ab9cc965929d1c4cc4eef (diff)
downloadnova-c852a4d48d2d7afe0a7d74b5da4d5b31386bbda3.tar.gz
nova-c852a4d48d2d7afe0a7d74b5da4d5b31386bbda3.tar.xz
nova-c852a4d48d2d7afe0a7d74b5da4d5b31386bbda3.zip
merging
Diffstat (limited to 'nova/version.py')
-rw-r--r--nova/version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/version.py b/nova/version.py
index 7b27acb6a..c3ecc2245 100644
--- a/nova/version.py
+++ b/nova/version.py
@@ -21,7 +21,7 @@ except ImportError:
'revision_id': 'LOCALREVISION',
'revno': 0}
-NOVA_VERSION = ['2011', '1']
+NOVA_VERSION = ['2011', '2']
YEAR, COUNT = NOVA_VERSION
FINAL = False # This becomes true at Release Candidate time