OpenStack Compute (nova)

Merge lp:~zulcss/nova/rc1 into lp:~openstack-ubuntu-testing/nova/grizzly

  1. rc1
  2. Merge into grizzly
Proposed by Chuck Short
Status: Merged
Approved by: Adam Gandelman
Approved revision: 564
Merged at revision: 564
Proposed branch: lp:~zulcss/nova/rc1
Merge into: lp:~openstack-ubuntu-testing/nova/grizzly
Diff against target: 36 lines (+4/-2)
2 files modified
debian/changelog (+3/-2)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~zulcss/nova/rc1
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+154453@code.launchpad.net
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 'debian/changelog'
2--- debian/changelog 2013-03-01 14:15:01 +0000
3+++ debian/changelog 2013-03-20 18:01:48 +0000
4@@ -1,4 +1,4 @@
5-nova (2013.1.a4723.ge807e19-0ubuntu1) UNRELEASED; urgency=low
6+nova (1:2013.1~rc1-0ubuntu1) raring; urgency=low
7
8 [ Chuck Short ]
9 * New upstream release.
10@@ -11,12 +11,13 @@
11 - Dropped python-simplejson no longer needed.
12 - Dropped python-tempita no longer needed.
13 - Dropped python-xattr no longer needed.
14+ - Add sqlite3 required for the testsuite.
15
16 [ James Page ]
17 * d/watch: Update uversionmangle to deal with upstream versioning
18 changes, remove tarballs.openstack.org.
19
20- -- Chuck Short <zulcss@ubuntu.com> Thu, 28 Feb 2013 09:00:15 -0600
21+ -- Chuck Short <zulcss@ubuntu.com> Wed, 20 Mar 2013 12:59:22 -0500
22
23 nova (2013.1.g3-0ubuntu1) raring; urgency=low
24
25
26=== modified file 'debian/control'
27--- debian/control 2013-02-28 17:00:13 +0000
28+++ debian/control 2013-03-20 18:01:48 +0000
29@@ -45,6 +45,7 @@
30 python-unittest2,
31 python-webob (>= 1.2.3),
32 pep8,
33+ sqlite3,
34 testrepository ( >= 0.0.8)
35 Build-Conflicts: python-cjson
36 Standards-Version: 3.9.3

Subscribers

People subscribed via source and target branches