← Back to branch summary

~blake-rouse/maas/is-importing-2.1

~blake-rouse/maas/is-importing-2.1

Viewing all changes in revision 4201.20.1.

Committer: LaMont Jones
Date: 2015-09-08 18:41:57 UTC
mfrom: (4201.19.1 rpc)
mto: (4201.1.58 networking-model)
mto: This revision was merged to the branch mainline in revision 4247.
Revision ID: lamont@canonical.com-20150908184157-532t4oujm1kya5l5

Merge my branch into the current trunk.

files modified:
src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_staticipaddress.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/dhcp/leases_parser.py

src/provisioningserver/dhcp/leases_parser_fast.py

src/provisioningserver/pserv_services/lease_upload_service.py

Show diffs side-by-side

added added

removed removed

src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_staticipaddress.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/dhcp/leases_parser.py

src/provisioningserver/dhcp/leases_parser_fast.py

src/provisioningserver/pserv_services/lease_upload_service.py

Older »