Merge lp:~blake-rouse/maas/fix-1511690 into lp:~maas-committers/maas/trunk
Proposed by
Blake Rouse
Status: | Merged |
---|---|
Approved by: | Blake Rouse |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4451 |
Proposed branch: | lp:~blake-rouse/maas/fix-1511690 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
59 lines (+5/-8) 3 files modified
src/maasserver/migrations/0187_link_missing_subnets.py (+3/-2) src/maasserver/models/tests/test_fannetwork.py (+1/-1) src/maasserver/websockets/tests/test_listener.py (+1/-5) |
To merge this branch: | bzr merge lp:~blake-rouse/maas/fix-1511690 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+276459@code.launchpad.net |
Commit message
Fix the assignment of the subnet on the static IP address migration. Fix the random tests failures from the last branch I landed.
To post a comment you must log in.
Self-approving, minor fix.