Merge lp:~ttx/nova/open-diablo into lp:~hudson-openstack/nova/trunk

Proposed by Thierry Carrez
Status: Merged
Approved by: Soren Hansen
Approved revision: 990
Merged at revision: 990
Proposed branch: lp:~ttx/nova/open-diablo
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 16 lines (+2/-2)
1 file modified
nova/version.py (+2/-2)
To merge this branch: bzr merge lp:~ttx/nova/open-diablo
Reviewer Review Type Date Requested Status
Soren Hansen (community) Approve
Review via email: mp+57834@code.launchpad.net

Description of the change

Diablo versioning.

To post a comment you must log in.
Revision history for this message
Soren Hansen (soren) wrote :

Let's get this show on the road.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/version.py'
2--- nova/version.py 2011-04-13 08:33:56 +0000
3+++ nova/version.py 2011-04-15 09:42:40 +0000
4@@ -21,10 +21,10 @@
5 'revision_id': 'LOCALREVISION',
6 'revno': 0}
7
8-NOVA_VERSION = ['2011', '2']
9+NOVA_VERSION = ['2011', '3']
10 YEAR, COUNT = NOVA_VERSION
11
12-FINAL = True # This becomes true at Release Candidate time
13+FINAL = False # This becomes true at Release Candidate time
14
15
16 def canonical_version_string():