OpenStack Compute (nova)

Merge lp:~soren/nova/open-cactus into lp:~hudson-openstack/nova/trunk

  1. open-cactus
  2. Merge into trunk
Proposed by Soren Hansen
Status: Merged
Approved by: Soren Hansen
Approved revision: 646
Merged at revision: 646
Proposed branch: lp:~soren/nova/open-cactus
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:~soren/nova/open-cactus
Reviewer Review Type Date Requested Status
Nova Core security contacts Pending
Review via email: mp+48492@code.launchpad.net

Description of the change

open cactus

To post a comment you must log in.

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-02-02 10:16:00 +0000
3+++ nova/version.py 2011-02-03 15:51:11 +0000
4@@ -21,10 +21,10 @@
5 'revision_id': 'LOCALREVISION',
6 'revno': 0}
7
8-NOVA_VERSION = ['2011', '1']
9+NOVA_VERSION = ['2011', '2']
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():