← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2119.

Committer: Gavin Panella
Date: 2014-03-30 21:34:24 UTC
mfrom: (1745.2.349 maas)
Revision ID: gavin.panella@canonical.com-20140330213424-qzg04tlltrclfjxh

Merge trunk r2094.

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

pkg/maas-cluster/provisioningserver/tftp.py

pkg/maas-region/maasserver/api.py

Show diffs side-by-side

added added

removed removed

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

pkg/maas-cluster/provisioningserver/tftp.py

pkg/maas-region/maasserver/api.py

Older »