MAAS

Merge lp://qastaging/~andreserl/maas/lp1582323 into lp://qastaging/~maas-committers/maas/trunk

  1. lp1582323
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 5586
Proposed branch: lp://qastaging/~andreserl/maas/lp1582323
Merge into: lp://qastaging/~maas-committers/maas/trunk
Diff against target: 73 lines (+38/-0)
2 files modified
src/provisioningserver/kernel_opts.py (+2/-0)
src/provisioningserver/tests/test_kernel_opts.py (+36/-0)
To merge this branch: bzr merge lp://qastaging/~andreserl/maas/lp1582323
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+312534@code.qastaging.launchpad.net

Commit message

Select MAAS datasource specifically to ensure commissioning doesn't fail when competing cloud metadata resides on disk

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve

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.