| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2016-06-02 | Integrate MP feedback | Daniel Watkins | |
| 2016-05-20 | Update merging documentation to make its application clearer | Daniel Watkins | |
| Currently, some users think that user-data and conf.d configuration will be merged together[0]. This has never been the case, and we should make it clear that this is not currently supported to avoid user confusion. [0] https://bugs.launchpad.net/cloud-init/+bug/1532234 | |||
| 2016-05-20 | Clean up merging.rst formatting | Daniel Watkins | |
| 2013-04-02 | Fix the default string used for merging. | Joshua Harlow | |
| It had been changed in code, but not in docs. So we needed to reflect the change in docs as well so that both are in sync. | |||
| 2013-03-08 | Enable the merging.txt to be in .rst format for public viewing | Joshua Harlow | |
 |
index : vyos-cloud-init.git | |
| (mirror of https://github.com/vyos/vyos-cloud-init.git) |
| summaryrefslogtreecommitdiff |