← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2191.

Committer: Gavin Panella
Date: 2014-04-01 14:34:44 UTC
mfrom: (1745.2.417 maas)
Revision ID: gavin.panella@canonical.com-20140401143444-43xfv5adleekfwim

Merge trunk r2162.

files modified:
pkg/maas-cluster/provisioningserver/__main__.py

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

pkg/maas-cluster/provisioningserver/tftp.py

pkg/maas-cluster/provisioningserver/uefi/install_grub.py

pkg/maas-cluster/provisioningserver/uefi/tests/test_config.py

pkg/maas-cluster/provisioningserver/uefi/tests/test_install_grub.py

pkg/maas-cluster/provisioningserver/uefi/tests/test_tftppath.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/__main__.py

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

pkg/maas-cluster/provisioningserver/tftp.py

pkg/maas-cluster/provisioningserver/uefi/install_grub.py

pkg/maas-cluster/provisioningserver/uefi/tests/test_config.py

pkg/maas-cluster/provisioningserver/uefi/tests/test_install_grub.py

pkg/maas-cluster/provisioningserver/uefi/tests/test_tftppath.py

Older »