Merge ~raharper/cloud-init:fix/merge-how-docs into cloud-init:master
Proposed by
Ryan Harper
Status: | Merged |
---|---|
Approved by: | Dan Watkins |
Approved revision: | 8b5381195ce394c0a6b99121207816e29ee6bb72 |
Merge reported by: | Server Team CI bot |
Merged at revision: | not available |
Proposed branch: | ~raharper/cloud-init:fix/merge-how-docs |
Merge into: | cloud-init:master |
Diff against target: |
138 lines (+84/-6) 1 file modified
doc/rtd/topics/merging.rst (+84/-6) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dan Watkins | Approve | ||
Server Team CI bot | continuous-integration | Approve | |
Review via email: mp+362083@code.launchpad.net |
Commit message
doc: update merging doc with fixes and some additional details/examples
Update config merging documentation with cloud-config syntax fix. Add an
example showing how to merge two files with runcmd.
To post a comment you must log in.
A doc reference to the tools/ccfg- merge-debug might be useful (probably that could use some improvements too)