Merge lp:~jtv/maas/pkg-bug-1238376 into lp:~maas-maintainers/maas/packaging

Proposed by Jeroen T. Vermeulen on 2013-10-11
Status: Merged
Approved by: Jeroen T. Vermeulen on 2013-10-11
Approved revision: 212
Merged at revision: 211
Proposed branch: lp:~jtv/maas/pkg-bug-1238376
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 27 lines (+5/-1)
2 files modified
debian/changelog (+4/-1)
debian/maas-cluster-controller.install (+1/-0)
To merge this branch: bzr merge lp:~jtv/maas/pkg-bug-1238376
Reviewer Review Type Date Requested Status
Andres Rodriguez 2013-10-11 Approve on 2013-10-11
Review via email: mp+190694@code.launchpad.net

This proposal supersedes a proposal from 2013-10-11.

Commit message

Restore (a new incarnation of) obsolescent /etc/maas/import_ephemerals.

Description of the change

This is part of the fix for bug 1238376. It requires this change to the source tree: https://code.launchpad.net/~jtv/maas/bug-1238376/+merge/190656 (already landed as r1701).

Jeroen

To post a comment you must log in.
review: Approve

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-10 21:08:07 +0000
3+++ debian/changelog 2013-10-11 15:17:53 +0000
4@@ -1,7 +1,10 @@
5-maas (1.4+bzr1693+dfsg-0ubuntu2) UNRELEASED; urgency=low
6+maas (1.4+bzr1701+dfsg-0ubuntu2) UNRELEASED; urgency=low
7
8 * UNRELEASED
9
10+ [ Jeroen Vermeulen ]
11+ * Keep legacy import_ephemerals config for now.
12+
13 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 10 Oct 2013 17:07:51 -0400
14
15 maas (1.4+bzr1693+dfsg-0ubuntu1) saucy; urgency=low
16
17=== modified file 'debian/maas-cluster-controller.install'
18--- debian/maas-cluster-controller.install 2013-10-04 14:56:01 +0000
19+++ debian/maas-cluster-controller.install 2013-10-11 15:17:53 +0000
20@@ -21,6 +21,7 @@
21 # Install maas-import-pxe-files and related files
22 debian/tmp/usr/sbin/maas-import-pxe-files
23 man/maas-import-pxe-files.8 usr/share/man/man8
24+debian/tmp/etc/maas/import_ephemerals
25 debian/tmp/etc/maas/import_pxe_files
26 debian/tmp/usr/sbin/maas-import-ephemerals
27 debian/tmp/usr/bin/uec2roottar

Subscribers

People subscribed via source and target branches