summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a66daab..d6adad85 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]
- SmartOS: datasource improvements and support for metadata service
providing networking information.