Merge ~cgrabowski/maas:fix_vlan_discovery_3.2 into maas:3.2
Proposed by
Christian Grabowski
Status: | Merged |
---|---|
Approved by: | Alberto Donato |
Approved revision: | 14202cb7119c1f7bc8c0ca02d04a2472ffb0e795 |
Merge reported by: | MAAS Lander |
Merged at revision: | not available |
Proposed branch: | ~cgrabowski/maas:fix_vlan_discovery_3.2 |
Merge into: | maas:3.2 |
Diff against target: |
71 lines (+7/-15) 3 files modified
src/maasserver/models/interface.py (+2/-10) src/maasserver/models/tests/test_interface.py (+2/-2) src/maasserver/models/tests/test_node.py (+3/-3) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alberto Donato (community) | Approve | ||
MAAS Lander | Approve | ||
Review via email: mp+424988@code.launchpad.net |
Commit message
update report_neighbours test
(cherry picked from commit 50f817870f78b6f
ignore observed vlan if already exists
(cherry picked from commit 717044811f22936
To post a comment you must log in.
UNIT TESTS discovery_ 3.2 lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas
-b fix_vlan_
STATUS: SUCCESS bc8c0ca02d04a24 72ffb0e795
COMMIT: 14202cb7119c1f7