← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 1970.

Committer: Gavin Panella
Date: 2014-03-30 21:07:25 UTC
mfrom: (1745.2.200 maas)
Revision ID: gavin.panella@canonical.com-20140330210725-iyk9gip0oskyweao

Merge trunk r1945.

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

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

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

pkg/maas-cluster/provisioningserver/tftp.py

services/pserv/run

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/plugin.py

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

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

pkg/maas-cluster/provisioningserver/tftp.py

services/pserv/run

Older »