← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2490.

Committer: Gavin Panella
Date: 2014-07-15 20:39:55 UTC
mfrom: (1745.2.716 maas)
Revision ID: gavin.panella@canonical.com-20140715203955-hpv24ubko2qm6tdk

Merge trunk r2461.

files modified:
pkg/maas-cluster/provisioningserver/boot/pxe.py

pkg/maas-cluster/provisioningserver/boot/tests/test_pxe.py

pkg/maas-cluster/provisioningserver/utils/__init__.py

pkg/maas-cluster/provisioningserver/utils/tests/test_utils.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/boot/pxe.py

pkg/maas-cluster/provisioningserver/boot/tests/test_pxe.py

pkg/maas-cluster/provisioningserver/utils/__init__.py

pkg/maas-cluster/provisioningserver/utils/tests/test_utils.py

Older »