← Back to branch summary

~rlane/nova/lp773690

« back to all changes in this revision

Viewing changes to nova/version.py

  • Committer: rlane at wikimedia
  • Date: 2011-04-29 22:30:40 UTC
  • mfrom: (382.1.655 nova)
  • Revision ID: rlane@wikimedia.org-20110429223040-i0x3ds9eqwrabyru
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/version.py
21
21
                    'revision_id': 'LOCALREVISION',
22
22
                    'revno': 0}
23
23
 
24
 
NOVA_VERSION = ['2011', '2']
 
24
 
 
25
NOVA_VERSION = ['2011', '3']
25
26
YEAR, COUNT = NOVA_VERSION
26
 
 
27
27
FINAL = False   # This becomes true at Release Candidate time
28
28
 
29
29
 
39
39
 
40
40
 
41
41
def vcs_version_string():
42
 
    return "%s:%s" % (version_info['branch_nick'], version_info['revision_id'])
 
42
    return '%s:%s' % (version_info['branch_nick'], version_info['revision_id'])
43
43
 
44
44
 
45
45
def version_string_with_vcs():
46
 
    return "%s-%s" % (canonical_version_string(), vcs_version_string())
 
46
    return '%s-%s' % (canonical_version_string(), vcs_version_string())