Merge ~alexsander-souza/maas:lp2043970 into maas:master
Proposed by
Alexsander de Souza
Status: | Merged |
---|---|
Approved by: | Alexsander de Souza |
Approved revision: | bd8361e6be9187bcf1adebbe7c3a58a4932d2afa |
Merge reported by: | MAAS Lander |
Merged at revision: | not available |
Proposed branch: | ~alexsander-souza/maas:lp2043970 |
Merge into: | maas:master |
Diff against target: |
126 lines (+60/-2) 4 files modified
src/maasserver/forms/settings.py (+14/-0) src/maasserver/models/config.py (+1/-0) src/metadataserver/builtin_scripts/network.py (+15/-2) src/metadataserver/builtin_scripts/tests/test_network.py (+30/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Lander | Approve | ||
Jack Lloyd-Walters | Approve | ||
Review via email:
|
Commit message
fix(metadataser
don't create a default VLAN for interfaces discovered by hardware sync
when MAAS cannot figure out the correct one.
fixes LP#2043970
To post a comment you must log in.
UNIT TESTS
-b lp2043970 lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas
STATUS: FAILED maas-ci. internal: 8080/job/ maas-tester/ 5040/console 5f4e086833157ed 134ac02172
LOG: http://
COMMIT: bf88e2c70f0cb58