Merge lp:~jtv/maas/1.2-maas-import-pxe-files-changes into lp:maas/1.2
Proposed by
Jeroen T. Vermeulen
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Jeroen T. Vermeulen | ||||||||
Approved revision: | no longer in the source branch. | ||||||||
Merged at revision: | 1385 | ||||||||
Proposed branch: | lp:~jtv/maas/1.2-maas-import-pxe-files-changes | ||||||||
Merge into: | lp:maas/1.2 | ||||||||
Diff against target: |
110 lines (+46/-21) 1 file modified
scripts/maas-import-pxe-files (+46/-21) |
||||||||
To merge this branch: | bzr merge lp:~jtv/maas/1.2-maas-import-pxe-files-changes | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email:
|
Commit message
Backport maas-import-
Description of the change
This is similar to https:/
It's not a clean merge, hence this merge proposal. But the changes were much the same as for 1.3.
Jeroen
To post a comment you must log in.