Merge lp:~allenap/maas/packaging.quantal.remove-squashfs into lp:~maas-maintainers/maas/packaging.quantal

Proposed by Gavin Panella on 2012-11-15
Status: Merged
Approved by: Gavin Panella on 2012-11-15
Approved revision: 143
Merged at revision: 143
Proposed branch: lp:~allenap/maas/packaging.quantal.remove-squashfs
Merge into: lp:~maas-maintainers/maas/packaging.quantal
Diff against target: 41 lines (+6/-6)
3 files modified
debian/changelog (+5/-0)
debian/extras/99-maas (+1/-4)
debian/maas-region-controller.install (+0/-2)
To merge this branch: bzr merge lp:~allenap/maas/packaging.quantal.remove-squashfs
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2012-11-15
Launchpad code reviewers 2012-11-15 Pending
Review via email: mp+134472@code.launchpad.net

Commit message

Remove all install-via-squashfs support.

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

Approved, though re-base this against the latest branch as there're changes and the changelog won't merge due to conflicts.

review: Approve
Gavin Panella (allenap) wrote :

Cheers for the review Andres.

MAAS Lander (maas-lander) wrote :

No commit message specified.

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 2012-11-13 20:42:13 +0000
3+++ debian/changelog 2012-11-15 15:13:22 +0000
4@@ -18,6 +18,11 @@
5 it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
6 didn't use /MAAS.
7
8+ [ Gavin Panella ]
9+ * debian/extras/99-maas: squashfs image download is no longer needed.
10+ * debian/maas-cluster-controller.install: maas-import-squashfs and its
11+ configuration file are no longer part of upstream.
12+
13 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 13 Nov 2012 14:58:21 -0500
14
15 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
16
17=== modified file 'debian/extras/99-maas'
18--- debian/extras/99-maas 2012-10-04 18:52:27 +0000
19+++ debian/extras/99-maas 2012-11-15 15:13:22 +0000
20@@ -1,7 +1,4 @@
21 # /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
22-#
23+#
24 # Enable launchpad personal package archives for squid-deb-proxy
25 ppa.launchpad.net
26-# Enable access to MAAS server HTTP to allow squashfs download
27-# during install
28-maas.internal.example.com # maasurl
29
30=== modified file 'debian/maas-region-controller.install'
31--- debian/maas-region-controller.install 2012-10-26 10:51:16 +0000
32+++ debian/maas-region-controller.install 2012-11-15 15:13:22 +0000
33@@ -29,8 +29,6 @@
34 etc/cron.d/maas-import-pxe-files
35 man/maas-import-pxe-files.8 usr/share/man/man8
36 debian/tmp/etc/maas/import_pxe_files
37-debian/tmp/usr/sbin/maas-import-squashfs
38-debian/tmp/etc/maas/import_squashfs
39 debian/tmp/usr/sbin/maas-import-ephemerals
40 debian/tmp/etc/maas/import_ephemerals
41 debian/tmp/etc/maas/commissioning-user-data

Subscribers

People subscribed via source and target branches

to all changes: