Merge lp:~ltrager/maas/combined_result_refresh into lp:~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: | 5780 | ||||||||
Proposed branch: | lp:~ltrager/maas/combined_result_refresh | ||||||||
Merge into: | lp:~maas-committers/maas/trunk | ||||||||
Diff against target: |
772 lines (+359/-180) 8 files modified
src/metadataserver/user_data/templates/snippets/maas_run_remote_scripts.py (+2/-51) src/metadataserver/user_data/templates/snippets/tests/test_maas_run_remote_scripts.py (+0/-115) src/provisioningserver/refresh/__init__.py (+48/-10) src/provisioningserver/refresh/maas_api_helper.py (+52/-0) src/provisioningserver/refresh/node_info_scripts.py (+26/-1) src/provisioningserver/refresh/tests/test_maas_api_helper.py (+111/-0) src/provisioningserver/refresh/tests/test_node_info_scripts.py (+26/-3) src/provisioningserver/refresh/tests/test_refresh.py (+94/-0) |
||||||||
To merge this branch: | bzr merge lp:~ltrager/maas/combined_result_refresh | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andres Rodriguez (community) | Approve | ||
Review via email: mp+318854@code.launchpad.net |
Commit message
Send combined commissioning results in addtion to stdout and stderr when refreshing.
To post a comment you must log in.
lgtm! it mostly seems moving stuff around.