summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-05-27 09:55:10 -0400
committerScott Moser <smoser@ubuntu.com>2016-05-27 09:55:10 -0400
commit318bd66461cba2f480b2ef6be119d2fcd5c6e9c0 (patch)
tree1817b310efc0190c92c5c95b15df6491119233ce /ChangeLog
parent949cebd48c9100d4fd00b74232bcf048980e6e0d (diff)
parent0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff)
downloadvyos-cloud-init-318bd66461cba2f480b2ef6be119d2fcd5c6e9c0.tar.gz
vyos-cloud-init-318bd66461cba2f480b2ef6be119d2fcd5c6e9c0.zip
merge from trunk
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e06578fc..8db29e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,9 @@
[Wido den Hollander]
- 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