Merge lp:~gnuoy/heat/juno-update-deps into lp:~ubuntu-server-dev/heat/juno

Proposed by Liam Young on 2014-07-04
Status: Needs review
Proposed branch: lp:~gnuoy/heat/juno-update-deps
Merge into: lp:~ubuntu-server-dev/heat/juno
Diff against target: 191 lines (+68/-42) (has conflicts)
4 files modified
debian/changelog (+9/-0)
debian/control (+56/-39)
debian/heat-common.install (+2/-2)
debian/heat-engine.install (+1/-1)
Text conflict in debian/changelog
Text conflict in debian/control
To merge this branch: bzr merge lp:~gnuoy/heat/juno-update-deps
Reviewer Review Type Date Requested Status
Chuck Short (community) 2014-07-04 Needs Fixing on 2014-07-04
Review via email: mp+225671@code.launchpad.net
To post a comment you must log in.
Chuck Short (zulcss) wrote :

Looks like you have a merge conflict in the debian/changelog.

review: Needs Fixing
Chuck Short (zulcss) wrote :

And in the debian/control

Unmerged revisions

61. By Liam Young on 2014-07-03

Added runtime dependancies from requirements.txt

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 2014-07-04 13:45:23 +0000
3+++ debian/changelog 2014-07-04 14:04:04 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 heat (2014.2~b1-0ubuntu3) UNRELEASED; urgency=medium
7
8 * debian/control: Add python-oslo.messaging
9@@ -6,6 +7,14 @@
10
11 -- Chuck Short <zulcss@ubuntu.com> Wed, 02 Jul 2014 10:07:27 -0400
12
13+=======
14+heat (2014.2~b1-0ubuntu3) utopic; urgency=medium
15+
16+ * debian/control: Merged in deps from requirements.txt
17+
18+ -- Liam Young <liam.young@canonical.com> Thu, 03 Jul 2014 16:42:44 +0100
19+
20+>>>>>>> MERGE-SOURCE
21 heat (2014.2~b1-0ubuntu2) utopic; urgency=medium
22
23 * debian/patches/default-sqlite.patch: Dropped.
24
25=== modified file 'debian/control'
26--- debian/control 2014-07-02 14:08:18 +0000
27+++ debian/control 2014-07-04 14:04:04 +0000
28@@ -9,53 +9,61 @@
29 Thomas Goirand <zigo@debian.org>,
30 Ghe Rivero <ghe.rivero@stackops.com>,
31 Mehdi Abaakouk <sileht@sileht.net>
32-Build-Depends:
33- debhelper (>= 9),
34- python-all (>= 2.6.6-3~),
35- python-pbr (>= 0.5.21),
36+Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python-pbr (>= 0.6)
37 Build-Depends-Indep:
38- python-babel,
39+ python-babel (>= 1.3),
40 python-boto (>= 2.4),
41- python-ceilometerclient,
42- python-cinderclient,
43+ python-ceilometerclient (>= 1.0.6),
44+ python-cinderclient (>= 1.0.6),
45 python-coverage,
46- python-crypto,
47- python-eventlet (>= 0.12.0),
48+ python-crypto (>= 2.6),
49+ python-eventlet (>= 0.13.0),
50 python-extras,
51- python-glanceclient,
52+ python-glanceclient (>= 0.9.0),
53 python-greenlet (>= 0.3.2),
54- python-heatclient,
55- python-httplib2,
56- python-iso8601,
57- python-keystoneclient (>= 1:0.2.3),
58- python-kombu,
59+ python-heatclient (>= 0.2.3),
60+ python-httplib2 (>= 0.7.5),
61+ python-iso8601 (>= 0.1.9),
62+ python-keystoneclient (>= 1:0.9.0),
63+ python-kombu (>= 2.4.8),
64 python-lockfile (>= 0.8),
65 python-lxml (>= 2.3),
66 python-memcache,
67- python-migrate,
68+ python-migrate (>= 0.9.1),
69 python-mox,
70+<<<<<<< TREE
71 python-netaddr,
72 python-neutronclient (>= 1:2.2.0),
73 python-novaclient,
74 python-oslo.config,
75 python-oslo.messaging,
76+=======
77+ python-netaddr (>= 0.7.6),
78+ python-neutronclient (>= 1:2.3.4),
79+ python-novaclient (>= 1:2.17.0),
80+ python-oslo.config (>= 1.2.0),
81+ python-oslo.messaging (>= 1.3.0),
82+>>>>>>> MERGE-SOURCE
83 python-oslosphinx,
84 python-oslotest,
85 python-paramiko,
86 python-paste,
87- python-pastedeploy,
88- python-routes,
89+ python-pastedeploy (>= 1.5.0),
90+ python-posix-ipc,
91+ python-qpid,
92+ python-requests (>= 1.1),
93+ python-routes (>= 1.12.3),
94 python-setuptools,
95- python-six,
96+ python-six (>= 1.6.0),
97 python-sphinx,
98 python-sqlalchemy (>= 0.7.8),
99- python-swiftclient,
100+ python-swiftclient (>= 1:2.1.0),
101 python-testrepository (>= 0.0.13),
102 python-testscenarios,
103 python-testtools (>= 0.9.29),
104- python-troveclient,
105+ python-troveclient (>= 1:1.0.5),
106 python-webob (>= 1.2.3),
107- python-yaml,
108+ python-yaml (>= 3.1.0),
109 testrepository (>= 0.0.13)
110 Standards-Version: 3.9.4
111 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/juno/files
112@@ -68,33 +76,42 @@
113 Architecture: all
114 Depends:
115 python-argparse,
116+ python-babel (>= 1.3),
117 python-boto (>= 2.4),
118- python-cinderclient,
119- python-crypto,
120- python-eventlet (>= 0.12.0),
121+ python-ceilometerclient (>= 1.0.6),
122+ python-cinderclient (>= 1.0.6),
123+ python-crypto (>= 2.6),
124+ python-eventlet (>= 0.13.0),
125 python-extras,
126- python-glanceclient,
127+ python-glanceclient (>= 0.9.0),
128 python-greenlet (>= 0.3.2),
129- python-httplib2,
130- python-iso8601,
131- python-keystoneclient (>= 1:0.2.3),
132- python-kombu,
133+ python-heatclient (>= 0.2.3),
134+ python-httplib2 (>= 0.7.5),
135+ python-iso8601 (>= 0.1.9),
136+ python-keystoneclient (>= 1:0.9.0),
137+ python-kombu (>= 2.4.8),
138 python-lxml (>= 2.3),
139 python-memcache,
140- python-migrate,
141+ python-migrate (>= 0.9.1),
142 python-mysqldb,
143- python-neutronclient (>= 1:2.2.0),
144- python-novaclient,
145- python-oslo.config,
146+ python-netaddr (>= 0.7.6),
147+ python-neutronclient (>= 1:2.3.4),
148+ python-novaclient (>= 1:2.17.0),
149+ python-oslo.config (>= 1.2.0),
150+ python-oslo.messaging (>= 1.3.0),
151 python-paste,
152- python-pastedeploy,
153- python-routes,
154+ python-pastedeploy (>= 1.5.0),
155+ python-posix-ipc,
156+ python-qpid,
157+ python-requests (>= 1.1),
158+ python-routes (>= 1.12.3),
159 python-setuptools,
160- python-six,
161+ python-six (>= 1.6.0),
162 python-sqlalchemy (>= 0.7.8),
163- python-swiftclient,
164+ python-swiftclient (>= 1:2.1.0),
165+ python-troveclient (>= 1:1.0.5),
166 python-webob (>= 1.2.3),
167- python-yaml,
168+ python-yaml (>= 3.1.0),
169 ${misc:Depends},
170 ${python:Depends}
171 Description: OpenStack orchestration service - Python files
172
173=== modified file 'debian/heat-common.install'
174--- debian/heat-common.install 2013-09-07 01:54:34 +0000
175+++ debian/heat-common.install 2014-07-04 14:04:04 +0000
176@@ -1,5 +1,5 @@
177+/usr/bin/heat-keystone-setup
178 /usr/bin/heat-manage
179-/usr/bin/heat-keystone-setup
180-etc/heat/policy.json
181 etc/heat/api-paste.ini
182 etc/heat/heat.conf etc/heat
183+etc/heat/policy.json
184
185=== modified file 'debian/heat-engine.install'
186--- debian/heat-engine.install 2014-02-27 21:51:19 +0000
187+++ debian/heat-engine.install 2014-07-04 14:04:04 +0000
188@@ -1,2 +1,2 @@
189+etc/heat/environment.d
190 usr/bin/heat-engine
191-etc/heat/environment.d

Subscribers

People subscribed via source and target branches