Merge lp://staging/~maas-maintainers/maas/new-import-script-integration into lp://staging/~maas-committers/maas/trunk
Proposed by
Raphaël Badin
| Status: | Merged |
|---|---|
| Approved by: | Jeroen T. Vermeulen |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2171 |
| Proposed branch: | lp://staging/~maas-maintainers/maas/new-import-script-integration |
| Merge into: | lp://staging/~maas-committers/maas/trunk |
| Diff against target: |
2453 lines (+793/-872) 30 files modified
contrib/maas-cluster-http.conf (+2/-2) etc/maas/bootresources.yaml (+62/-0) etc/maas/import_ephemerals (+2/-2) etc/maas/pserv.yaml (+0/-28) etc/maas/templates/pxe/config.install.armhf.template (+0/-5) scripts/maas-import-pxe-files (+39/-446) setup.py (+1/-0) src/maasserver/models/bootimage.py (+1/-1) src/maasserver/preseed.py (+24/-3) src/maasserver/tests/test_preseed.py (+42/-5) src/metadataserver/tests/test_api.py (+6/-1) src/provisioningserver/boot_images.py (+3/-7) src/provisioningserver/config.py (+10/-8) src/provisioningserver/driver/__init__.py (+2/-2) src/provisioningserver/import_images/boot_resources.py (+341/-86) src/provisioningserver/import_images/tests/test_boot_resources.py (+54/-0) src/provisioningserver/import_images/tests/test_ephemerals_script.py (+0/-117) src/provisioningserver/kernel_opts.py (+5/-23) src/provisioningserver/pxe/config.py (+9/-6) src/provisioningserver/pxe/tests/test_config.py (+4/-43) src/provisioningserver/pxe/tests/test_tftppath.py (+32/-12) src/provisioningserver/pxe/tftppath.py (+34/-17) src/provisioningserver/rpc/tests/test_clusterservice.py (+2/-2) src/provisioningserver/testing/boot_images.py (+16/-3) src/provisioningserver/tests/test_config.py (+9/-8) src/provisioningserver/tests/test_kernel_opts.py (+5/-42) src/provisioningserver/tests/test_maas_import_pxe_files.py (+6/-0) src/provisioningserver/tests/test_upgrade_cluster.py (+56/-2) src/provisioningserver/tftp.py (+2/-0) src/provisioningserver/upgrade_cluster.py (+24/-1) |
| To merge this branch: | bzr merge lp://staging/~maas-maintainers/maas/new-import-script-integration |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jeroen T. Vermeulen (community) | Approve | ||
| Graham Binns (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge Oleg Strikov's new version of maas-import-
To post a comment you must log in.
Revision history for this message
| Jeroen T. Vermeulen (jtv) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Approving on behalf of all who sailed the merry seas of this here branch.