diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-05-26 11:30:07 -0400 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-05-26 11:30:07 -0400 |
| commit | eb90339f094da74eafcc6555907e247e25a8902b (patch) | |
| tree | e5ac40e24ead1273497bca3dba6006f51f5a8d73 /nova/version.py | |
| parent | 2278f2886d369af285f914a7b5883d3a7a5727cc (diff) | |
| parent | db18a792414240cbdb1221d0e79e8a63313f103e (diff) | |
Merge trunk.
Diffstat (limited to 'nova/version.py')
| -rw-r--r-- | nova/version.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/version.py b/nova/version.py index c3ecc2245..1f8d08e8c 100644 --- a/nova/version.py +++ b/nova/version.py @@ -21,9 +21,9 @@ except ImportError: 'revision_id': 'LOCALREVISION', 'revno': 0} -NOVA_VERSION = ['2011', '2'] -YEAR, COUNT = NOVA_VERSION +NOVA_VERSION = ['2011', '3'] +YEAR, COUNT = NOVA_VERSION FINAL = False # This becomes true at Release Candidate time @@ -39,8 +39,8 @@ def version_string(): def vcs_version_string(): - return "%s:%s" % (version_info['branch_nick'], version_info['revision_id']) + return '%s:%s' % (version_info['branch_nick'], version_info['revision_id']) def version_string_with_vcs(): - return "%s-%s" % (canonical_version_string(), vcs_version_string()) + return '%s-%s' % (canonical_version_string(), vcs_version_string()) |