OpenStack Heat

Merge lp:~corey.bryant/heat/kilo-3 into lp:~ubuntu-server-dev/heat/kilo

  1. kilo-3
  2. Merge into kilo
Proposed by Corey Bryant
Status: Merged
Merged at revision: 93
Proposed branch: lp:~corey.bryant/heat/kilo-3
Merge into: lp:~ubuntu-server-dev/heat/kilo
Diff against target: 159 lines (+37/-27)
4 files modified
debian/changelog (+9/-0)
debian/control (+22/-18)
debian/patches/fix-requirements.patch (+3/-6)
debian/patches/sudoers_patch.patch (+3/-3)
To merge this branch: bzr merge lp:~corey.bryant/heat/kilo-3
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+253730@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/heat/kilo-3 updated
93. By Corey Bryant

* New upstream release.
  - d/control: Align with upstream dependencies.
  - d/p/sudoers_patch.patch: Rebased.
  - d/p/fix-requirements.patch: Rebased.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-03-19 14:27:59 +0000
+++ debian/changelog 2015-03-20 18:50:02 +0000
@@ -1,3 +1,12 @@
1heat (2015.1~b3-0ubuntu1) UNRELEASED; urgency=medium
2
3 * New upstream release.
4 - d/control: Align with upstream dependencies.
5 - d/p/sudoers_patch.patch: Rebased.
6 - d/p/fix-requirements.patch: Rebased.
7
8 -- Corey Bryant <corey.bryant@canonical.com> Fri, 20 Mar 2015 14:41:28 -0400
9
1heat (2015.1~b2-0ubuntu3) vivid; urgency=medium10heat (2015.1~b2-0ubuntu3) vivid; urgency=medium
211
3 * d/pydist-overrides: Add overrides for oslo packages.12 * d/pydist-overrides: Add overrides for oslo packages.
413
=== modified file 'debian/control'
--- debian/control 2015-03-19 14:27:59 +0000
+++ debian/control 2015-03-20 18:50:02 +0000
@@ -28,30 +28,32 @@
28 python-glanceclient (>= 1:0.15.0),28 python-glanceclient (>= 1:0.15.0),
29 python-greenlet (>= 0.3.2),29 python-greenlet (>= 0.3.2),
30 python-hacking (>= 0.9.4),30 python-hacking (>= 0.9.4),
31 python-heatclient (>= 0.2.9),31 python-heatclient (>= 0.3.0),
32 python-httplib2 (>= 0.7.5),32 python-httplib2 (>= 0.7.5),
33 python-iso8601 (>= 0.1.9),33 python-iso8601 (>= 0.1.9),
34 python-keystoneclient (>= 1:1.0.0),34 python-keystoneclient (>= 1:1.1.0),
35 python-keystonemiddleware (>= 1.0.0),35 python-keystonemiddleware (>= 1.0.0),
36 python-kombu (>=2.5.0),36 python-kombu (>=2.5.0),
37 python-lockfile (>= 0.8),37 python-lockfile (>= 0.8),
38 python-lxml (>= 2.3),38 python-lxml (>= 2.3),
39 python-memcache,39 python-memcache,
40 python-migrate (>= 0.9.1),40 python-migrate (>= 0.9.5),
41 python-mock (>= 1.0),41 python-mock (>= 1.0),
42 python-mox (>= 0.5.3),42 python-mox (>= 0.5.3),
43 python-mysqldb,43 python-mysqldb,
44 python-netaddr (>= 0.7.12),44 python-netaddr (>= 0.7.12),
45 python-neutronclient (>= 1:2.3.6),45 python-neutronclient (>= 1:2.3.11),
46 python-novaclient (>= 1:2.18.0),46 python-novaclient (>= 1:2.18.0),
47 python-oslo-config (>= 1:1.6.0),47 python-oslo-config (>= 1:1.9.0),
48 python-oslo-context (>= 0.1.0),48 python-oslo-context (>= 0.2.0),
49 python-oslo-db (>= 1.4.1),49 python-oslo-db (>= 1.5.0),
50 python-oslo-i18n (>= 1.3.0),50 python-oslo-i18n (>= 1.3.0),
51 python-oslo-messaging (>= 1.4.0),51 python-oslo-log (>= 0.4.0),
52 python-oslo-messaging (>= 1.6.0),
52 python-oslo-middleware (>= 0.3.0),53 python-oslo-middleware (>= 0.3.0),
53 python-oslo-serialization (>= 1.2.0),54 python-oslo-serialization (>= 1.2.0),
54 python-oslo-utils (>= 1.2.0),55 python-oslo-utils (>= 1.2.0),
56 python-oslo-versionedobjects (>= 0.1.0),
55 python-oslosphinx (>= 2.2.0),57 python-oslosphinx (>= 2.2.0),
56 python-oslotest (>= 1:1.2.0),58 python-oslotest (>= 1:1.2.0),
57 python-osprofiler (>= 0.3.0),59 python-osprofiler (>= 0.3.0),
@@ -64,7 +66,7 @@
64 python-routes (>= 1.12.3),66 python-routes (>= 1.12.3),
65 python-saharaclient (>= 0.7.6),67 python-saharaclient (>= 0.7.6),
66 python-setuptools,68 python-setuptools,
67 python-six (>= 1.7.0),69 python-six (>= 1.9.0),
68 python-sphinx (>= 1.1.2),70 python-sphinx (>= 1.1.2),
69 python-sqlalchemy (>= 0.9.7),71 python-sqlalchemy (>= 0.9.7),
70 python-stevedore (>= 1.1.0),72 python-stevedore (>= 1.1.0),
@@ -100,28 +102,30 @@
100 python-glanceclient (>= 1:0.15.0),102 python-glanceclient (>= 1:0.15.0),
101 python-greenlet (>= 0.3.2),103 python-greenlet (>= 0.3.2),
102 python-hacking (>= 0.9.4),104 python-hacking (>= 0.9.4),
103 python-heatclient (>= 0.2.9),105 python-heatclient (>= 0.3.0),
104 python-httplib2 (>= 0.7.5),106 python-httplib2 (>= 0.7.5),
105 python-iso8601 (>= 0.1.9),107 python-iso8601 (>= 0.1.9),
106 python-keystoneclient (>= 1:1.0.0),108 python-keystoneclient (>= 1:1.1.0),
107 python-keystonemiddleware (>= 1.0.0),109 python-keystonemiddleware (>= 1.0.0),
108 python-kombu (>=2.5.0),110 python-kombu (>=2.5.0),
109 python-lockfile (>= 0.8),111 python-lockfile (>= 0.8),
110 python-lxml (>= 2.3),112 python-lxml (>= 2.3),
111 python-memcache,113 python-memcache,
112 python-migrate (>= 0.9.1),114 python-migrate (>= 0.9.5),
113 python-mysqldb,115 python-mysqldb,
114 python-netaddr (>= 0.7.12),116 python-netaddr (>= 0.7.12),
115 python-neutronclient (>= 1:2.3.6),117 python-neutronclient (>= 1:2.3.11),
116 python-novaclient (>= 1:2.18.0),118 python-novaclient (>= 1:2.18.0),
117 python-oslo-config (>= 1:1.6.0),119 python-oslo-config (>= 1:1.9.0),
118 python-oslo-context (>= 0.1.0),120 python-oslo-context (>= 0.2.0),
119 python-oslo-db (>= 1.4.1),121 python-oslo-db (>= 1.5.0),
120 python-oslo-i18n (>= 1.3.0),122 python-oslo-i18n (>= 1.3.0),
121 python-oslo-messaging (>= 1.4.0),123 python-oslo-log (>= 0.4.0),
124 python-oslo-messaging (>= 1.6.0),
122 python-oslo-middleware (>= 0.3.0),125 python-oslo-middleware (>= 0.3.0),
123 python-oslo-serialization (>= 1.2.0),126 python-oslo-serialization (>= 1.2.0),
124 python-oslo-utils (>= 1.2.0),127 python-oslo-utils (>= 1.2.0),
128 python-oslo-versionedobjects (>= 0.1.0),
125 python-oslosphinx (>= 2.2.0),129 python-oslosphinx (>= 2.2.0),
126 python-osprofiler (>= 0.3.0),130 python-osprofiler (>= 0.3.0),
127 python-paste,131 python-paste,
@@ -133,7 +137,7 @@
133 python-routes (>= 1.12.3),137 python-routes (>= 1.12.3),
134 python-saharaclient (>= 0.7.6),138 python-saharaclient (>= 0.7.6),
135 python-setuptools,139 python-setuptools,
136 python-six (>= 1.7.0),140 python-six (>= 1.9.0),
137 python-sphinx (>= 1.1.2),141 python-sphinx (>= 1.1.2),
138 python-sqlalchemy (>= 0.9.7),142 python-sqlalchemy (>= 0.9.7),
139 python-stevedore (>= 1.1.0),143 python-stevedore (>= 1.1.0),
140144
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch 2015-01-05 20:56:10 +0000
+++ debian/patches/fix-requirements.patch 2015-03-20 18:50:02 +0000
@@ -1,6 +1,6 @@
1--- a/requirements.txt1--- a/requirements.txt
2+++ b/requirements.txt2+++ b/requirements.txt
3@@ -35,11 +35,10 @@3@@ -37,9 +37,8 @@
4 python-swiftclient>=2.2.04 python-swiftclient>=2.2.0
5 python-troveclient>=1.0.75 python-troveclient>=1.0.7
6 PyYAML>=3.1.06 PyYAML>=3.1.0
@@ -8,9 +8,6 @@
8 requests>=2.2.0,!=2.4.08 requests>=2.2.0,!=2.4.0
9-Routes>=1.12.3,!=2.09-Routes>=1.12.3,!=2.0
10+Routes>=1.12.310+Routes>=1.12.3
11 six>=1.7.011 six>=1.9.0
12 SQLAlchemy>=0.9.7,<=0.9.9912 SQLAlchemy>=0.9.7,<=0.9.99
13-sqlalchemy-migrate>=0.9.1,!=0.9.213 sqlalchemy-migrate>=0.9.5
14+sqlalchemy-migrate>=0.9.1
15 stevedore>=1.1.0 # Apache-2.0
16 WebOb>=1.2.3
1714
=== modified file 'debian/patches/sudoers_patch.patch'
--- debian/patches/sudoers_patch.patch 2014-10-09 15:38:53 +0000
+++ debian/patches/sudoers_patch.patch 2015-03-20 18:50:02 +0000
@@ -1,9 +1,9 @@
1Description: Change sudoers directory to be sudoers.d1Description: Change sudoers directory to be sudoers.d
2Author: Chuck Short <zulcss@ubuntu.com>2Author: Chuck Short <zulcss@ubuntu.com>
3Forwarded: Not needed.3Forwarded: Not needed.
4--- a/heat/engine/resources/nova_utils.py4--- a/heat/engine/nova_utils.py
5+++ b/heat/engine/resources/nova_utils.py5+++ b/heat/engine/nova_utils.py
6@@ -170,8 +170,8 @@ def build_userdata(resource, userdata=No6@@ -171,8 +171,8 @@
7 #7 #
8 # See bug https://bugs.launchpad.net/heat/+bug/12574108 # See bug https://bugs.launchpad.net/heat/+bug/1257410
9 boothook_custom_user = r"""useradd -m %s9 boothook_custom_user = r"""useradd -m %s

Subscribers

People subscribed via source and target branches