Merge lp:~zulcss/heat/icehouse-ftbfs into lp:~ubuntu-server-dev/heat/icehouse

Proposed by Chuck Short on 2013-11-26
Status: Merged
Approved by: Adam Gandelman on 2013-11-26
Approved revision: 27
Merged at revision: 27
Proposed branch: lp:~zulcss/heat/icehouse-ftbfs
Merge into: lp:~ubuntu-server-dev/heat/icehouse
Diff against target: 76 lines (+15/-21)
4 files modified
debian/changelog (+13/-2)
debian/control (+2/-2)
debian/patches/default-sqlite.patch (+0/-16)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~zulcss/heat/icehouse-ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2013-11-26 Pending
Review via email: mp+196645@code.launchpad.net

Description of the change

fixes ftbfs

To post a comment you must log in.

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-10-22 16:55:12 +0000
3+++ debian/changelog 2013-11-26 01:53:50 +0000
4@@ -1,9 +1,20 @@
5-heat (2013.2~rc2-0ubuntu2) UNRELEASED; urgency=low
6+heat (2013.2-0ubuntu2) UNRELEASED; urgency=low
7
8- * debian/control: open icehouse release.
9+ * debian/control:
10+ + Open icehouse release.
11+ + Dropped python-argparse.
12+ + Add versioned depends for python-pbr.
13+ + Add python-testscenarios as a build dependency.
14+ * debian/patches/default-sqlite.patch: Dropped no longer needed.
15
16 -- Chuck Short <zulcss@ubuntu.com> Tue, 22 Oct 2013 09:55:12 -0700
17
18+heat (2013.2-0ubuntu1) saucy; urgency=low
19+
20+ * New upstream release (LP: #1236462).
21+
22+ -- Chuck Short <zulcss@ubuntu.com> Thu, 17 Oct 2013 09:30:24 -0400
23+
24 heat (2013.2~rc2-0ubuntu1) saucy; urgency=low
25
26 * New upstream release candidate (LP: #1239156).
27
28=== modified file 'debian/control'
29--- debian/control 2013-10-22 16:55:12 +0000
30+++ debian/control 2013-11-26 01:53:50 +0000
31@@ -12,9 +12,8 @@
32 Build-Depends:
33 debhelper (>= 9),
34 python-all (>= 2.6.6-3~),
35- python-pbr
36+ python-pbr (>= 0.5.21),
37 Build-Depends-Indep:
38- python-argparse,
39 python-babel,
40 python-boto (>= 2.4),
41 python-ceilometerclient,
42@@ -53,6 +52,7 @@
43 python-sqlalchemy (>= 0.7.8),
44 python-swiftclient,
45 python-testrepository (>= 0.0.13),
46+ python-testscenarios,
47 python-testtools (>= 0.9.29),
48 python-webob (>= 1.2.3),
49 python-yaml,
50
51=== removed file 'debian/patches/default-sqlite.patch'
52--- debian/patches/default-sqlite.patch 2013-09-06 23:40:55 +0000
53+++ debian/patches/default-sqlite.patch 1970-01-01 00:00:00 +0000
54@@ -1,16 +0,0 @@
55-Description: Default to using sqlite
56-Author: James Page <james.page@ubuntu.com>
57-Forwarded: not-needed
58----
59-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
60-Index: heat/etc/heat/heat.conf.sample
61---- heat.orig/etc/heat/heat.conf.sample 2013-09-06 16:37:54.000000000 -0700
62-+++ heat/etc/heat/heat.conf.sample 2013-09-06 16:39:31.363547917 -0700
63-@@ -7,6 +7,7 @@
64- # The SQLAlchemy connection string used to connect to the
65- # database (string value)
66- #sql_connection=mysql://heat:heat@localhost/heat
67-+sql_connection = sqlite:////var/lib/heat/heat.sqlite
68-
69- # timeout before idle sql connections are reaped (integer
70- # value)
71
72=== removed file 'debian/patches/series'
73--- debian/patches/series 2013-09-06 23:40:55 +0000
74+++ debian/patches/series 1970-01-01 00:00:00 +0000
75@@ -1,1 +0,0 @@
76-default-sqlite.patch

Subscribers

People subscribed via source and target branches