Ironic

Merge lp:~corey.bryant/ironic/2015.1-b2-0ubuntu1 into lp:~ubuntu-server-dev/ironic/kilo

  1. 2015.1-b2-0ubuntu1
  2. Merge into kilo
Proposed by Corey Bryant
Status: Merged
Merged at revision: 26
Proposed branch: lp:~corey.bryant/ironic/2015.1-b2-0ubuntu1
Merge into: lp:~ubuntu-server-dev/ironic/kilo
Diff against target: 197 lines (+71/-45)
4 files modified
debian/changelog (+8/-0)
debian/control (+52/-45)
debian/patches/fix-requirements.patch (+10/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~corey.bryant/ironic/2015.1-b2-0ubuntu1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+249524@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/ironic/2015.1-b2-0ubuntu1 updated
27. By Corey Bryant

Add dash to python-oslo-* dependencies

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 2015-01-14 16:24:39 +0000
3+++ debian/changelog 2015-02-12 17:02:55 +0000
4@@ -1,3 +1,11 @@
5+ironic (2015.1~b2-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * New upstream release.
8+ - d/control: Align with upstream dependencies.
9+ - d/p/fix-requirements.patch: Added to drop websockify.
10+
11+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 06 Feb 2015 09:34:01 -0500
12+
13 ironic (2015.1~b1-0ubuntu4) vivid; urgency=medium
14
15 * Rebuild to pick up pkgos upstart generation fix.
16
17=== modified file 'debian/control'
18--- debian/control 2015-01-14 15:46:10 +0000
19+++ debian/control 2015-02-12 17:02:55 +0000
20@@ -3,7 +3,7 @@
21 Priority: extra
22 Maintainer: Chuck Short <zulcss@ubuntu.com>
23 Build-Depends:
24- alembic (>= 0.7.1),
25+ alembic (>= 0.7.2),
26 debhelper (>= 9~),
27 dh-systemd,
28 openstack-pkg-tools (>= 21ubuntu5~),
29@@ -11,15 +11,17 @@
30 python-amqplib (>= 0.3.3),
31 python-anyjson (>=0.3.3),
32 python-babel (>= 1.3),
33- python-eventlet (>= 0.15.2),
34+ python-coverage (>= 3.6),
35+ python-eventlet (>= 0.16.1),
36 python-fixtures (>= 0.3.14),
37- python-glanceclient (>= 0.15.0),
38+ python-glanceclient (>= 1:0.15.0),
39 python-greenlet (>= 0.3.2),
40- python-ironicclient,
41+ python-hacking (>= 0.9.2),
42+ python-ironicclient (>= 0.2.1),
43 python-iso8601 (>= 0.1.9),
44- python-jinja2,
45+ python-jinja2 (>= 2.6),
46 python-jsonpatch (>= 1.1),
47- python-keystoneclient (>= 0.11.1),
48+ python-keystoneclient (>= 1:1.0.0),
49 python-keystonemiddleware (>= 1.0.0),
50 python-lockfile (>= 0.8),
51 python-lxml (>= 2.3),
52@@ -27,35 +29,38 @@
53 python-mock (>= 1.0),
54 python-mysqldb,
55 python-netaddr (>= 0.7.12),
56- python-neutronclient (>= 2.3.6),
57- python-oslo.concurrency (>= 0.3.0),
58- python-oslo.config (>= 1.4.0),
59- python-oslo.db (>= 1.1.0),
60- python-oslo.i18n (>= 1.0.0),
61- python-oslo.messaging (>= 1.5.0),
62- python-oslo.rootwrap (>= 1.3.0),
63- python-oslo.serialization (>= 1.0.0),
64- python-oslo.utils (>= 1.1.0),
65- python-oslotest (>= 1.1.0),
66+ python-neutronclient (>= 1:2.3.6),
67+ python-oslo-concurrency (>= 1.4.1),
68+ python-oslo-config (>= 1.6.0),
69+ python-oslo-db (>= 1.4.1),
70+ python-oslo-i18n (>= 1.3.0),
71+ python-oslo-messaging (>= 1.6.0),
72+ python-oslo-rootwrap (>= 1.5.0),
73+ python-oslo-serialization (>= 1.2.0),
74+ python-oslo-utils (>= 1.2.0),
75+ python-oslosphinx (>= 2.2.0),
76+ python-oslotest (>= 1:1.2.0),
77 python-paramiko (>= 1.13.0),
78- python-pbr (>= 0.5.21),
79+ python-pbr (>= 0.6),
80 python-pecan (>= 0.8.0),
81 python-posix-ipc,
82- python-pyghmi,
83+ python-psycopg2,
84 python-retrying (>= 1.2.3),
85- python-sendfile,
86+ python-requests (>= 2.2.0),
87+ python-sendfile (>= 2.0.0),
88 python-setuptools,
89 python-six (>= 1.7.0),
90- python-sqlalchemy (>= 0.7.8),
91+ python-sphinx (>= 1.1.2),
92+ python-sphinxcontrib-pecanwsme (>= 0.8),
93+ python-sqlalchemy (>= 0.9.7),
94 python-stevedore (>= 1.1.0),
95- python-subunit,
96- python-swiftclient (>= 2.2.0),
97- python-testtools (>= 0.9.34),
98+ python-subunit (>= 0.0.18),
99+ python-swiftclient (>= 1:2.2.0),
100+ python-testtools (>= 0.9.36),
101 python-webob (>= 1.2.3),
102- python-wsme (>= 0.6.4),
103+ python-wsme (>= 0.6),
104 subunit,
105- testrepository (>= 0.0.17),
106- websockify (>= 0.6.0)
107+ testrepository (>= 0.0.18),
108 Standards-Version: 3.9.6
109 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ironic/kilo/files
110 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ironic/kilo
111@@ -63,43 +68,45 @@
112 Package: python-ironic
113 Architecture: all
114 Depends:
115- alembic (>= 0.6.4),
116+ alembic (>= 0.7.2),
117 python-amqplib (>= 0.3.3),
118 python-anyjson (>= 0.3.3),
119 python-babel,
120- python-eventlet (>= 0.13.0),
121- python-glanceclient (>= 0.15.0),
122+ python-eventlet (>= 0.16.1),
123+ python-glanceclient (>= 1:0.15.0),
124 python-greenlet (>= 0.3.2),
125 python-iso8601 (>= 0.1.9),
126- python-jinja2,
127+ python-jinja2 (>= 2.6),
128 python-jsonpatch (>= 1.1),
129- python-keystoneclient (>= 0.11.1),
130+ python-keystoneclient (>= 1:1.0.0),
131 python-keystonemiddleware (>= 1.0.0),
132 python-kombu (>= 2.4.8),
133 python-lockfile (>= 0.8),
134 python-lxml (>= 2.3),
135 python-migrate (>= 0.9.1),
136 python-netaddr (>= 0.7.12),
137- python-neutronclient (>= 2.3.6),
138- python-oslo.concurrency (>= 0.3.0),
139- python-oslo.config (>= 1.4.0),
140- python-oslo.db (>= 1.1.0),
141- python-oslo.i18n (>= 1.0.0),
142- python-oslo.messaging (>= 1.5.0),
143- python-oslo.rootwrap (>= 1.3.0),
144- python-oslo.serialization (>= 1.0.0),
145- python-oslo.utils (>= 1.1.0),
146+ python-neutronclient (>= 1:2.3.6),
147+ python-oslo-concurrency (>= 1.4.1),
148+ python-oslo-config (>= 1.6.0),
149+ python-oslo-db (>= 1.4.1),
150+ python-oslo-i18n (>= 1.3.0),
151+ python-oslo-messaging (>= 1.6.0),
152+ python-oslo-rootwrap (>= 1.5.0),
153+ python-oslo-serialization (>= 1.2.0),
154+ python-oslo-utils (>= 1.2.0),
155 python-paramiko (>= 1.13.0),
156+ python-pbr (>= 0.6),
157 python-pecan (>= 0.8.0),
158- python-pyghmi,
159+ python-posix-ipc,
160 python-retrying (>= 1.2.3),
161+ python-requests (>= 2.2.0),
162+ python-sendfile (>= 2.0.0),
163 python-six (>= 1.7.0),
164- python-sqlalchemy (>= 0.7.8),
165+ python-sqlalchemy (>= 0.9.7),
166 python-stevedore (>= 1.1.0),
167- python-swiftclient (>= 2.2.0),
168+ python-swiftclient (>= 1:2.2.0),
169 python-webob (>= 1.2.3),
170- python-wsme (>= 0.6.4),
171- websockify (>= 0.6.0),
172+ python-wsme (>= 0.6),
173 ${misc:Depends},
174 ${python:Depends}
175 Description: Openstack bare metal provisioning service - Python library
176
177=== added file 'debian/patches/fix-requirements.patch'
178--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
179+++ debian/patches/fix-requirements.patch 2015-02-12 17:02:55 +0000
180@@ -0,0 +1,10 @@
181+--- a/requirements.txt
182++++ b/requirements.txt
183+@@ -18,7 +18,6 @@
184+ python-swiftclient>=2.2.0
185+ stevedore>=1.1.0 # Apache-2.0
186+ pysendfile==2.0.0
187+-websockify>=0.6.0,<0.7
188+ oslo.concurrency>=1.4.1 # Apache-2.0
189+ oslo.config>=1.6.0 # Apache-2.0
190+ oslo.db>=1.4.1 # Apache-2.0
191
192=== modified file 'debian/patches/series'
193--- debian/patches/series 2014-09-30 22:21:41 +0000
194+++ debian/patches/series 2015-02-12 17:02:55 +0000
195@@ -1,1 +1,2 @@
196+fix-requirements.patch
197 set_config_defaults.patch

Subscribers

People subscribed via source and target branches