OpenStack Compute (nova)

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

  1. grizzly-refresh
  2. Merge into grizzly
Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 557
Merged at revision: 557
Proposed branch: lp:~zulcss/nova/grizzly-refresh
Merge into: lp:~openstack-ubuntu-testing/nova/grizzly
Diff against target: 61 lines (+12/-10)
3 files modified
debian/changelog (+2/-1)
debian/control (+1/-0)
debian/patches/avoid_setuptools_git_dependency.patch (+9/-9)
To merge this branch: bzr merge lp:~zulcss/nova/grizzly-refresh
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+149607@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

review: Approve

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-02-12 14:05:25 +0000
3+++ debian/changelog 2013-02-20 15:53:20 +0000
4@@ -1,4 +1,4 @@
5-nova (2013.1~g2-0ubuntu3) UNRELEASED; urgency=low
6+nova (2013.1.a4539.g032308c-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Chuck Short ]
9 * New usptream release.
10@@ -13,6 +13,7 @@
11 * debian/nova-common.postinst: Removed config file conversion, since
12 the option is no longer available. (LP: #1110567)
13 * debian/control: Add python-pyasn1 as a dependency.
14+ * debian/control: Add python-oslo-config as a dependency.
15
16 [ Adam Gandelman ]
17 * debian/control: Fix typo (websocikfy -> websockify).
18
19=== modified file 'debian/control'
20--- debian/control 2013-02-12 14:05:25 +0000
21+++ debian/control 2013-02-20 15:53:20 +0000
22@@ -32,6 +32,7 @@
23 python-mox,
24 python-netaddr,
25 python-novaclient (>= 1:2.9.0),
26+ python-oslo-config,
27 python-paramiko,
28 python-paste,
29 python-pastedeploy (>= 1.5.0),
30
31=== modified file 'debian/patches/avoid_setuptools_git_dependency.patch'
32--- debian/patches/avoid_setuptools_git_dependency.patch 2013-01-30 14:40:55 +0000
33+++ debian/patches/avoid_setuptools_git_dependency.patch 2013-02-20 15:53:20 +0000
34@@ -1,18 +1,18 @@
35-diff -Naurp nova-2013.1.orig/setup.py nova-2013.1/setup.py
36---- nova-2013.1.orig/setup.py 2013-01-30 06:15:44.000000000 -0600
37-+++ nova-2013.1/setup.py 2013-01-30 08:39:13.680907782 -0600
38-@@ -43,7 +43,6 @@ setuptools.setup(name='nova',
39- install_requires=requires,
40+diff -Naurp nova-2013.1.a4539.g032308c.orig/setup.py nova-2013.1.a4539.g032308c/setup.py
41+--- nova-2013.1.a4539.g032308c.orig/setup.py 2013-02-20 09:26:49.000000000 -0600
42++++ nova-2013.1.a4539.g032308c/setup.py 2013-02-20 09:34:57.313915950 -0600
43+@@ -46,7 +46,6 @@ setuptools.setup(
44+ dependency_links=depend_links,
45 include_package_data=True,
46 test_suite='nose.collector',
47 - setup_requires=['setuptools_git>=0.4'],
48 scripts=['bin/nova-all',
49 'bin/nova-api',
50 'bin/nova-api-ec2',
51-diff -Naurp nova-2013.1.orig/tools/pip-requires nova-2013.1/tools/pip-requires
52---- nova-2013.1.orig/tools/pip-requires 2013-01-30 06:15:44.000000000 -0600
53-+++ nova-2013.1/tools/pip-requires 2013-01-30 08:39:26.836907788 -0600
54-@@ -19,7 +19,6 @@ paramiko
55+diff -Naurp nova-2013.1.a4539.g032308c.orig/tools/pip-requires nova-2013.1.a4539.g032308c/tools/pip-requires
56+--- nova-2013.1.a4539.g032308c.orig/tools/pip-requires 2013-02-20 09:26:49.000000000 -0600
57++++ nova-2013.1.a4539.g032308c/tools/pip-requires 2013-02-20 09:35:08.525916217 -0600
58+@@ -20,7 +20,6 @@ pyasn1
59 Babel>=0.9.6
60 iso8601>=0.1.4
61 httplib2

Subscribers

People subscribed via source and target branches