summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2016-06-02 17:32:14 +0100
committerDaniel Watkins <daniel.watkins@canonical.com>2016-06-02 17:32:14 +0100
commit710590d3a32e6b77222b288e5b751e7296abb2b4 (patch)
tree591461ad3ebd24a6f57194af8302f6848f835e17 /ChangeLog
parent0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff)
parent75907ec96181599dc0282aac989ce02a88c3b39d (diff)
downloadvyos-cloud-init-710590d3a32e6b77222b288e5b751e7296abb2b4.tar.gz
vyos-cloud-init-710590d3a32e6b77222b288e5b751e7296abb2b4.zip
Improve merging documentation
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8db29e2e..45a9ea8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -112,6 +112,7 @@
- Ec2: do not retry requests for user-data path on 404.
- settings on the kernel command line (cc:) override all local settings
rather than only those in /etc/cloud/cloud.cfg (LP: #1582323)
+ - Improve merging documentation [Daniel Watkins]
0.7.6:
- open 0.7.6