diff options
| author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-30 13:10:13 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-30 13:10:13 +0200 |
| commit | aefffff0e3df98a435133b598217401c3f953cc6 (patch) | |
| tree | 9a141352c311aa541f93de560fcfec9c0d213476 /ChangeLog | |
| parent | 3c85315373306729443ef79fd8e54af46a7bc849 (diff) | |
| parent | 0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff) | |
| download | vyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.tar.gz vyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.zip | |
merge with last upstream to avoid merging conflicts on MP
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |