OpenStack Compute (nova)

Merge lp:~soren/nova/austin-versioning into lp:~hudson-openstack/nova/trunk

  1. austin-versioning
  2. Merge into trunk
Proposed by Soren Hansen
Status: Merged
Approved by: Rick Clark
Approved revision: 371
Merged at revision: 370
Proposed branch: lp:~soren/nova/austin-versioning
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 28 lines (+3/-3)
2 files modified
doc/source/conf.py (+2/-2)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~soren/nova/austin-versioning
Reviewer Review Type Date Requested Status
Devin Carlen (community) Approve
Rick Clark (community) Approve
Review via email: mp+38906@code.launchpad.net

Description of the change

Update version set in setup.py to 2010.1 in preparation for Austin release.

To post a comment you must log in.
Revision history for this message
Rick Clark (dendrobates) wrote :

lgtm

review: Approve
Revision history for this message
Rick Clark (dendrobates) wrote :

approved

review: Approve
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/conf.py'
2--- doc/source/conf.py 2010-07-28 15:21:57 +0000
3+++ doc/source/conf.py 2010-10-20 03:42:43 +0000
4@@ -47,9 +47,9 @@
5 # built documents.
6 #
7 # The short X.Y version.
8-version = '0.9'
9+version = '2010.1'
10 # The full version, including alpha/beta/rc tags.
11-release = '0.9.1'
12+release = '2010.1'
13
14 # The language for content autogenerated by Sphinx. Refer to documentation
15 # for a list of supported languages.
16
17=== modified file 'setup.py'
18--- setup.py 2010-09-24 08:21:10 +0000
19+++ setup.py 2010-10-20 03:42:43 +0000
20@@ -39,7 +39,7 @@
21 sdist.run(self)
22
23 setup(name='nova',
24- version='0.9.1',
25+ version='2010.1',
26 description='cloud computing fabric controller',
27 author='OpenStack',
28 author_email='nova@lists.launchpad.net',