Merge lp:~ttx/nova/bexar-2011.1.1 into lp:nova/bexar

[Thierry Carrez]

Add support for micro-versions, and bump version number to 2011.1.1.

Add support for micro-versions, and bump version number to 2011.1.1.
Under the new simplified form it should probably not be forward-ported to Cactus.

[Soren Hansen (soren)]

I think this is needlessly paranoid. I don't believe we intend to ever not have a micro version again, and the safe guards (the try/except blocks) are there to protect against changes to code in the very same file, which seems a bit pointless to me?

review: Needs Information

[Thierry Carrez (ttx)]

Simplified. You should know by now that I'm a bit paranoid.

[lp:~ttx/nova/bexar-2011.1.1]

648. By Thierry Carrez on 2011-02-18

Simplify patch to only support version number with microversions, since this is a one-off

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

lgtm. Waiting for soren on marking approved

review: Approve

[Soren Hansen (soren)]

Let's do it.

review: Approve

=== modified file 'nova/version.py'
--- nova/version.py	2011-02-02 10:16:00 +0000
+++ nova/version.py	2011-02-18 12:44:08 +0000
@@ -21,14 +21,14 @@
                     'revision_id': 'LOCALREVISION',
                     'revno': 0}
 
-NOVA_VERSION = ['2011', '1']
-YEAR, COUNT = NOVA_VERSION
+NOVA_VERSION = ['2011', '1', '1']
+YEAR, COUNT, MICRO = NOVA_VERSION
 
 FINAL = True   # This becomes true at Release Candidate time
 
 
 def canonical_version_string():
-    return '.'.join([YEAR, COUNT])
+    return '.'.join([YEAR, COUNT, MICRO])
 
 
 def version_string():