← Back to branch summary

~allenap/maas/ltrager--refresh_locking

~allenap/maas/ltrager--refresh_locking

Viewing all changes in revision 5080.

Committer: Lee Trager
Date: 2016-06-08 01:46:28 UTC
mfrom: (5070.1.18 maas)
Revision ID: lee.trager@canonical.com-20160608014628-uxfvpar7ex7gqcin

Merge trunk

files removed:
src/provisioningserver/networks.py

src/provisioningserver/tests/test_networks.py

files modified:
src/maasserver/api/boot_sources.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/tests/test_boot_sources.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/bootresources.py

src/maasserver/tests/test_bootresources.py

src/maastesting/factory.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/support_dump.py

src/provisioningserver/utils/env.py

src/provisioningserver/utils/tests/test_env.py

Show diffs side-by-side

added added

removed removed

src/maasserver/api/boot_sources.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/tests/test_boot_sources.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/bootresources.py

src/maasserver/tests/test_bootresources.py

src/maastesting/factory.py

src/provisioningserver/networks.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/support_dump.py

src/provisioningserver/tests/test_networks.py

src/provisioningserver/utils/env.py

src/provisioningserver/utils/tests/test_env.py

Older »