← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2519.

Committer: Gavin Panella
Date: 2014-07-15 20:42:33 UTC
mfrom: (1745.2.745 maas)
Revision ID: gavin.panella@canonical.com-20140715204233-kw781lrxfzjbdapo

Merge trunk r2490.

files modified:
pkg/maas-cluster/provisioningserver/dns/config.py

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

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

pkg/maas-region/maasserver/tests/test_dns.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/dns/config.py

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

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

pkg/maas-region/maasserver/tests/test_dns.py

Older »