Merge lp:~ltrager/maas/global_min_hwe_kernel into lp:~maas-committers/maas/trunk
Status: | Merged |
---|---|
Approved by: | Lee Trager |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4406 |
Proposed branch: | lp:~ltrager/maas/global_min_hwe_kernel |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
367 lines (+140/-5) 12 files modified
src/maasserver/api/pxeconfig.py (+12/-1) src/maasserver/api/tests/test_pxeconfig.py (+20/-0) src/maasserver/forms.py (+7/-1) src/maasserver/forms_settings.py (+39/-0) src/maasserver/models/config.py (+1/-0) src/maasserver/models/node.py (+6/-0) src/maasserver/models/tests/test_node.py (+14/-0) src/maasserver/static/js/angular/controllers/add_hardware.js (+3/-1) src/maasserver/static/js/angular/factories/general.js (+10/-0) src/maasserver/static/js/angular/factories/tests/test_general.js (+15/-2) src/maasserver/tests/test_forms_commissioning.py (+8/-0) src/maasserver/websockets/handlers/general.py (+5/-0) |
To merge this branch: | bzr merge lp:~ltrager/maas/global_min_hwe_kernel |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Andres Rodriguez (community) | Needs Information | ||
Review via email: mp+275477@code.launchpad.net |
Commit message
Add global_
Description of the change
This branch adds the global_
This branch also instructions MAAS to follow any requirements set by min_hwe_kernel during commissioning and enlistment. Because min_hwe_kernel is now used during enlistment and commissioning global_
The core looks good. But needs to fix some things. See inline.