Merge ~emdw/maas:backport-fix-1959648-to-3.3 into maas:3.3

Proposed by Eline Maaike De Weerd
Status: Merged
Approved by: Adam Collard
Approved revision: c01ad07fbc1811b988c4c7133ef7a3a86d885da2
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~emdw/maas:backport-fix-1959648-to-3.3
Merge into: maas:3.3
Diff against target: 28 lines (+6/-0)
2 files modified
src/maasserver/websockets/handlers/tests/test_vlan.py (+3/-0)
src/maasserver/websockets/handlers/vlan.py (+3/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Eline Maaike De Weerd Approve
Review via email: mp+440928@code.staging.launchpad.net

Commit message

included subnet ids with vlan returns
(please check if it's doing the right thing, was unsure about bug description)
(cherry picked from commit 7e48dfa48c83eddfed5f24e29bdb365881dc1024)

To post a comment you must log in.
Revision history for this message
Eline Maaike De Weerd (emdw) wrote :

Self-approve: backport to 3.3

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b backport-fix-1959648-to-3.3 lp:~emdw/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/2313/consoleText

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b backport-fix-1959648-to-3.3 lp:~emdw/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c01ad07fbc1811b988c4c7133ef7a3a86d885da2

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b backport-fix-1959648-to-3.3 lp:~emdw/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/2315/consoleText

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches