diff options
| author | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-05-25 17:03:14 +0900 |
|---|---|---|
| committer | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-05-25 17:03:14 +0900 |
| commit | 2adf37233cb1b145bcb95e20bec53ea186558265 (patch) | |
| tree | 4d8f3f8d05b1be95eab804147efb67b712c7263e /nova/version.py | |
| parent | 8c66d79a41044837a0865b1a706dd89e788597d1 (diff) | |
| parent | 02b97593d0b3ee60ab879e5184be742ef3ac1b64 (diff) | |
merged recent 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()) |