Merge lp:~andreserl/maas/lp1482859 into lp:~maas-committers/maas/trunk

Proposed by Andres Rodriguez
Status: Superseded
Proposed branch: lp:~andreserl/maas/lp1482859
Merge into: lp:~maas-committers/maas/trunk
To merge this branch: bzr merge lp:~andreserl/maas/lp1482859
Reviewer Review Type Date Requested Status
MAAS Maintainers Pending
Review via email: mp+267918@code.launchpad.net

This proposal has been superseded by a proposal from 2015-08-13.

To post a comment you must log in.
lp:~andreserl/maas/lp1482859 updated
421. By Andres Rodriguez

Update postinst

Unmerged revisions

421. By Andres Rodriguez

Update postinst

420. By Andres Rodriguez

Move /etc/maas/maas-proxy.conf to /usr/share/maas/maas-proxy.conf as
this is not a config we want users to modify. (LP: #1482859)

419. By Andres Rodriguez

[r=andreserl][bug=1482857][author=andreserl] Update the location of dhcpd.conf and dhcpd6.conf to be /var/lib/maas/
and handle upgrades. (LP: #1482857)

418. By Andres Rodriguez

[r=andreserl][bug=][author=andreserl] debian/maas-cluster-controller.postinst: Correctly obtain the region url on upgrades

417. By Scott Moser

[r=andreserl,ltrager,deej][bug=1474417][author=smoser] maas-proxy: sync apt specific squid config with squid-deb-proxy

This improves maas-proxy for handling apt specific files. And
generally syncs it up with squid-deb-proxy's config files.

416. By Andres Rodriguez

[r=andreserl][bug=1471946][author=allenap] Ensures that regiond.conf and clusterd.conf are both initialised after package installation.

maas-clusterd will also be restarted if the shared secret is missing. Previously it would never be started.

415. By Andres Rodriguez

[r=andreserl][bug=][author=andreserl] - debian/maas-region-controller.postinst: Ensure DNS config
    migration is always run.
* debian/control: Make maas-dns a Dependy of maas-region-controller.

414. By Andres Rodriguez

[r=mpontillo][bug=1413388][author=andreserl] LP: #1413388 Handle upgrades to migrate named.conf.settings

413. By Raphaël Badin

[r=rbanffy][bug=1413388][author=rvb] Drop dependency on python-iscpy: the code has been integrated into MAAS.

412. By Gavin Panella

[r=rbanffy][bug=][author=allenap] Remove hard tabs from most files in the packaging scripts.

The mix of hard and soft tabs causes pain when altering the packaging, not least visually misaligned diffs.