diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-05-26 09:05:14 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-05-26 09:05:14 -0400 |
| commit | a021b43b7d45f8cc803721002a0b2e7d9ea9a06d (patch) | |
| tree | 6c3f6274d91a511a04a322a46d8678f4ad18d71a /nova/version.py | |
| parent | 9d2513ea3a6d586e1fe3deae778a02bb089b9a5e (diff) | |
| parent | db18a792414240cbdb1221d0e79e8a63313f103e (diff) | |
| download | nova-a021b43b7d45f8cc803721002a0b2e7d9ea9a06d.tar.gz nova-a021b43b7d45f8cc803721002a0b2e7d9ea9a06d.tar.xz nova-a021b43b7d45f8cc803721002a0b2e7d9ea9a06d.zip | |
Merge w/ 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()) |