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

Proposed by Liam Young
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) Needs Fixing
Review via email: mp+225671@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) wrote :

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

review: Needs Fixing
Revision history for this message
Chuck Short (zulcss) wrote :

And in the debian/control

Unmerged revisions

61. By Liam Young

Added runtime dependancies from requirements.txt

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-07-04 13:45:23 +0000
+++ debian/changelog 2014-07-04 14:04:04 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1heat (2014.2~b1-0ubuntu3) UNRELEASED; urgency=medium2heat (2014.2~b1-0ubuntu3) UNRELEASED; urgency=medium
23
3 * debian/control: Add python-oslo.messaging 4 * debian/control: Add python-oslo.messaging
@@ -6,6 +7,14 @@
67
7 -- Chuck Short <zulcss@ubuntu.com> Wed, 02 Jul 2014 10:07:27 -04008 -- Chuck Short <zulcss@ubuntu.com> Wed, 02 Jul 2014 10:07:27 -0400
89
10=======
11heat (2014.2~b1-0ubuntu3) utopic; urgency=medium
12
13 * debian/control: Merged in deps from requirements.txt
14
15 -- Liam Young <liam.young@canonical.com> Thu, 03 Jul 2014 16:42:44 +0100
16
17>>>>>>> MERGE-SOURCE
9heat (2014.2~b1-0ubuntu2) utopic; urgency=medium18heat (2014.2~b1-0ubuntu2) utopic; urgency=medium
1019
11 * debian/patches/default-sqlite.patch: Dropped. 20 * debian/patches/default-sqlite.patch: Dropped.
1221
=== modified file 'debian/control'
--- debian/control 2014-07-02 14:08:18 +0000
+++ debian/control 2014-07-04 14:04:04 +0000
@@ -9,53 +9,61 @@
9 Thomas Goirand <zigo@debian.org>,9 Thomas Goirand <zigo@debian.org>,
10 Ghe Rivero <ghe.rivero@stackops.com>,10 Ghe Rivero <ghe.rivero@stackops.com>,
11 Mehdi Abaakouk <sileht@sileht.net>11 Mehdi Abaakouk <sileht@sileht.net>
12Build-Depends:12Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python-pbr (>= 0.6)
13 debhelper (>= 9),
14 python-all (>= 2.6.6-3~),
15 python-pbr (>= 0.5.21),
16Build-Depends-Indep:13Build-Depends-Indep:
17 python-babel,14 python-babel (>= 1.3),
18 python-boto (>= 2.4),15 python-boto (>= 2.4),
19 python-ceilometerclient,16 python-ceilometerclient (>= 1.0.6),
20 python-cinderclient,17 python-cinderclient (>= 1.0.6),
21 python-coverage,18 python-coverage,
22 python-crypto,19 python-crypto (>= 2.6),
23 python-eventlet (>= 0.12.0),20 python-eventlet (>= 0.13.0),
24 python-extras,21 python-extras,
25 python-glanceclient,22 python-glanceclient (>= 0.9.0),
26 python-greenlet (>= 0.3.2),23 python-greenlet (>= 0.3.2),
27 python-heatclient,24 python-heatclient (>= 0.2.3),
28 python-httplib2,25 python-httplib2 (>= 0.7.5),
29 python-iso8601,26 python-iso8601 (>= 0.1.9),
30 python-keystoneclient (>= 1:0.2.3),27 python-keystoneclient (>= 1:0.9.0),
31 python-kombu,28 python-kombu (>= 2.4.8),
32 python-lockfile (>= 0.8),29 python-lockfile (>= 0.8),
33 python-lxml (>= 2.3),30 python-lxml (>= 2.3),
34 python-memcache,31 python-memcache,
35 python-migrate,32 python-migrate (>= 0.9.1),
36 python-mox,33 python-mox,
34<<<<<<< TREE
37 python-netaddr,35 python-netaddr,
38 python-neutronclient (>= 1:2.2.0),36 python-neutronclient (>= 1:2.2.0),
39 python-novaclient,37 python-novaclient,
40 python-oslo.config,38 python-oslo.config,
41 python-oslo.messaging,39 python-oslo.messaging,
40=======
41 python-netaddr (>= 0.7.6),
42 python-neutronclient (>= 1:2.3.4),
43 python-novaclient (>= 1:2.17.0),
44 python-oslo.config (>= 1.2.0),
45 python-oslo.messaging (>= 1.3.0),
46>>>>>>> MERGE-SOURCE
42 python-oslosphinx,47 python-oslosphinx,
43 python-oslotest,48 python-oslotest,
44 python-paramiko,49 python-paramiko,
45 python-paste,50 python-paste,
46 python-pastedeploy,51 python-pastedeploy (>= 1.5.0),
47 python-routes,52 python-posix-ipc,
53 python-qpid,
54 python-requests (>= 1.1),
55 python-routes (>= 1.12.3),
48 python-setuptools,56 python-setuptools,
49 python-six,57 python-six (>= 1.6.0),
50 python-sphinx,58 python-sphinx,
51 python-sqlalchemy (>= 0.7.8),59 python-sqlalchemy (>= 0.7.8),
52 python-swiftclient,60 python-swiftclient (>= 1:2.1.0),
53 python-testrepository (>= 0.0.13),61 python-testrepository (>= 0.0.13),
54 python-testscenarios,62 python-testscenarios,
55 python-testtools (>= 0.9.29),63 python-testtools (>= 0.9.29),
56 python-troveclient,64 python-troveclient (>= 1:1.0.5),
57 python-webob (>= 1.2.3),65 python-webob (>= 1.2.3),
58 python-yaml,66 python-yaml (>= 3.1.0),
59 testrepository (>= 0.0.13)67 testrepository (>= 0.0.13)
60Standards-Version: 3.9.468Standards-Version: 3.9.4
61Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/juno/files69Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/juno/files
@@ -68,33 +76,42 @@
68Architecture: all76Architecture: all
69Depends:77Depends:
70 python-argparse,78 python-argparse,
79 python-babel (>= 1.3),
71 python-boto (>= 2.4),80 python-boto (>= 2.4),
72 python-cinderclient,81 python-ceilometerclient (>= 1.0.6),
73 python-crypto,82 python-cinderclient (>= 1.0.6),
74 python-eventlet (>= 0.12.0),83 python-crypto (>= 2.6),
84 python-eventlet (>= 0.13.0),
75 python-extras,85 python-extras,
76 python-glanceclient,86 python-glanceclient (>= 0.9.0),
77 python-greenlet (>= 0.3.2),87 python-greenlet (>= 0.3.2),
78 python-httplib2,88 python-heatclient (>= 0.2.3),
79 python-iso8601,89 python-httplib2 (>= 0.7.5),
80 python-keystoneclient (>= 1:0.2.3),90 python-iso8601 (>= 0.1.9),
81 python-kombu,91 python-keystoneclient (>= 1:0.9.0),
92 python-kombu (>= 2.4.8),
82 python-lxml (>= 2.3),93 python-lxml (>= 2.3),
83 python-memcache,94 python-memcache,
84 python-migrate,95 python-migrate (>= 0.9.1),
85 python-mysqldb,96 python-mysqldb,
86 python-neutronclient (>= 1:2.2.0),97 python-netaddr (>= 0.7.6),
87 python-novaclient,98 python-neutronclient (>= 1:2.3.4),
88 python-oslo.config,99 python-novaclient (>= 1:2.17.0),
100 python-oslo.config (>= 1.2.0),
101 python-oslo.messaging (>= 1.3.0),
89 python-paste,102 python-paste,
90 python-pastedeploy,103 python-pastedeploy (>= 1.5.0),
91 python-routes,104 python-posix-ipc,
105 python-qpid,
106 python-requests (>= 1.1),
107 python-routes (>= 1.12.3),
92 python-setuptools,108 python-setuptools,
93 python-six,109 python-six (>= 1.6.0),
94 python-sqlalchemy (>= 0.7.8),110 python-sqlalchemy (>= 0.7.8),
95 python-swiftclient,111 python-swiftclient (>= 1:2.1.0),
112 python-troveclient (>= 1:1.0.5),
96 python-webob (>= 1.2.3),113 python-webob (>= 1.2.3),
97 python-yaml,114 python-yaml (>= 3.1.0),
98 ${misc:Depends},115 ${misc:Depends},
99 ${python:Depends}116 ${python:Depends}
100Description: OpenStack orchestration service - Python files117Description: OpenStack orchestration service - Python files
101118
=== modified file 'debian/heat-common.install'
--- debian/heat-common.install 2013-09-07 01:54:34 +0000
+++ debian/heat-common.install 2014-07-04 14:04:04 +0000
@@ -1,5 +1,5 @@
1/usr/bin/heat-keystone-setup
1/usr/bin/heat-manage2/usr/bin/heat-manage
2/usr/bin/heat-keystone-setup
3etc/heat/policy.json
4etc/heat/api-paste.ini3etc/heat/api-paste.ini
5etc/heat/heat.conf etc/heat4etc/heat/heat.conf etc/heat
5etc/heat/policy.json
66
=== modified file 'debian/heat-engine.install'
--- debian/heat-engine.install 2014-02-27 21:51:19 +0000
+++ debian/heat-engine.install 2014-07-04 14:04:04 +0000
@@ -1,2 +1,2 @@
1etc/heat/environment.d
1usr/bin/heat-engine2usr/bin/heat-engine
2etc/heat/environment.d

Subscribers

People subscribed via source and target branches