diff options
author | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
---|---|---|
committer | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
commit | a9e4009ae7221ea167b3e1083a887564483e0350 (patch) | |
tree | a370bd47399b1517c21b89d68aefd5afc15c5418 /ChangeLog | |
parent | 4a0e460f18d8cbf2651286565efec1f00cbb20cd (diff) | |
parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
download | vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.tar.gz vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.zip |
Fix merge conflict
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -13,10 +13,16 @@ redirect cloud-init stderr and stdout /var/log/cloud-init-output.log. - drop support for resizing partitions with parted entirely (LP: #1212492). This was broken as it was anyway. - - add support for vendordata. + - add support for vendordata in SmartOS and NoCloud datasources. - drop dependency on boto for crawling ec2 metadata service. - add 'Requires' on sudo (for OpenNebula datasource) in rpm specs, and 'Recommends' in the debian/control.in [Vlastimil Holer] + - if mount_info reports /dev/root is a device path for /, then convert + that to a device via help of kernel cmdline. + - configdrive: consider partitions as possible datasources if they have + theh correct filesystem label. [Paul Querna] + - initial freebsd support [Harm Weites] + - fix in is_ipv4 to accept IP addresses with a '0' in them. 0.7.4: - fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a partitioned block device with target filesystem on ephemeral0.1. |