← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2189.

Committer: Gavin Panella
Date: 2014-04-01 14:34:41 UTC
mfrom: (1745.2.415 maas)
Revision ID: gavin.panella@canonical.com-20140401143441-nkjx5rwczccwyhbr

Merge trunk r2160.

files modified:
pkg/maas-cluster/etc/maas/templates/dhcp/dhcpd.conf.template

pkg/maas-cluster/provisioningserver/tests/test_maas_import_pxe_files.py

pkg/maas-cluster/scripts/maas-import-pxe-files

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/etc/maas/templates/dhcp/dhcpd.conf.template

pkg/maas-cluster/provisioningserver/tests/test_maas_import_pxe_files.py

pkg/maas-cluster/scripts/maas-import-pxe-files

Older »