diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-02 16:45:58 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-02 16:45:58 -0400 |
| commit | 8ddfc28d055b610f592802e4c9fd4c3ede778918 (patch) | |
| tree | 76a37c2aa6db0258ad7d2ca87c3e68df1c2e4dc9 /ChangeLog | |
| parent | d709524941ba2b4e06940a9eb0861f0819d5560f (diff) | |
| parent | 710590d3a32e6b77222b288e5b751e7296abb2b4 (diff) | |
| download | vyos-cloud-init-8ddfc28d055b610f592802e4c9fd4c3ede778918.tar.gz vyos-cloud-init-8ddfc28d055b610f592802e4c9fd4c3ede778918.zip | |
merge with trunk
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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. |