← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2450.

Committer: Gavin Panella
Date: 2014-07-15 20:09:48 UTC
mfrom: (1745.2.676 maas)
Revision ID: gavin.panella@canonical.com-20140715200948-cansbwho3mmr122f

Merge trunk r2421.

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

pkg/maas-region/maasserver/enum.py

pkg/maas-region/maasserver/models/tests/test_staticipaddress.py

pkg/maas-region/maasserver/testing/factory.py

Show diffs side-by-side

added added

removed removed

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

pkg/maas-region/maasserver/enum.py

pkg/maas-region/maasserver/models/tests/test_staticipaddress.py

pkg/maas-region/maasserver/testing/factory.py

Older »