From bd035a5a6d2d36102986da491c996f1c17fcda40 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Wed, 11 Jan 2012 07:19:59 +0000
Subject: [PATCH] Add optional revision field to version number

Add a revision field to the version number to account for releases from
the stable branch, e.g. 2011.3.1.

See http://wiki.openstack.org/StableBranchRelease

Change-Id: I34238a5639d34c9cf44655775a6be80fdd446233
---
 nova/version.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nova/version.py b/nova/version.py
index 9a6563b80820..8f6641ef5cc5 100644
--- a/nova/version.py
+++ b/nova/version.py
@@ -14,13 +14,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-NOVA_VERSION = ['2012', '1']
-YEAR, COUNT = NOVA_VERSION
+NOVA_VERSION = ['2012', '1', None]
+YEAR, COUNT, REVISION = NOVA_VERSION
 FINAL = False   # This becomes true at Release Candidate time
 
 
 def canonical_version_string():
-    return '.'.join([YEAR, COUNT])
+    return '.'.join(filter(None, NOVA_VERSION))
 
 
 def version_string():