summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-05-26 11:51:38 -0400
committerScott Moser <smoser@ubuntu.com>2016-05-26 11:51:38 -0400
commit4789f071a1ad7a437f257d3f1cb46d1ea3a52150 (patch)
tree760f6efefb202211245ee89b298588fe56295e52 /ChangeLog
parentac851b8ff106abb4314d2b71f2a7dc194b259899 (diff)
parent0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff)
downloadvyos-cloud-init-4789f071a1ad7a437f257d3f1cb46d1ea3a52150.tar.gz
vyos-cloud-init-4789f071a1ad7a437f257d3f1cb46d1ea3a52150.zip
merge with trunk
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6748e8fa..8db29e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -110,6 +110,8 @@
- Paths: fix instance path if datasource's id has a '/'. (LP: #1575938)
[Robert Jennings]
- 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)
0.7.6:
- open 0.7.6