Merge lp://staging/~ltrager/maas/lp1629491 into lp://staging/~maas-committers/maas/trunk
Proposed by
Lee Trager
Status: | Merged |
---|---|
Approved by: | Lee Trager |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5429 |
Proposed branch: | lp://staging/~ltrager/maas/lp1629491 |
Merge into: | lp://staging/~maas-committers/maas/trunk |
Diff against target: |
133 lines (+52/-13) 5 files modified
src/maasserver/models/tests/test_bootresource.py (+3/-3) src/maasserver/rpc/boot.py (+8/-1) src/maasserver/rpc/tests/test_boot.py (+36/-7) src/maasserver/utils/osystems.py (+4/-1) src/maasserver/utils/tests/test_osystems.py (+1/-1) |
To merge this branch: | bzr merge lp://staging/~ltrager/maas/lp1629491 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+307458@code.staging.launchpad.net |
Commit message
Use validate_hwe_kernel when setting the commissiong kernel.
The kernel format changed from hwe-<letter> to hwe-<version> in 2.1. Users who upgraded from a previous version may still be using the old format in the min_hwe_kernel field. validate_hwe_kernel converts from the old format to the new transparently so commissioning continues to work.
To post a comment you must log in.
Code looks good. As long as it works, ;-)