diff options
| author | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-02-04 19:20:17 -0600 |
|---|---|---|
| committer | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-02-04 19:20:17 -0600 |
| commit | 2f2bd4232b3f51f571f76c30b715c215e5815703 (patch) | |
| tree | 086f68ab8efe1b6fac204be34fa26efe2ad60f9f /ChangeLog | |
| parent | 1f24e50c655ccc0c49afcd3225ce8f0e0bce05b9 (diff) | |
| parent | 6b294286e0d0a1da6b24b338cae3b900a763e9d2 (diff) | |
| download | vyos-cloud-init-2f2bd4232b3f51f571f76c30b715c215e5815703.tar.gz vyos-cloud-init-2f2bd4232b3f51f571f76c30b715c215e5815703.zip | |
Merge from trunk and resolve text conflict in ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -71,7 +71,11 @@ - Azure: get instance id from dmi instead of SharedConfig (LP: #1506187) - systemd/power_state: fix power_state to work even if cloud-final exited non-zero (LP: #1449318) - - lxd: add support for setting up lxd using 'lxd init' + - SmartOS: Add support for Joyent LX-Brand Zones (LP: #1540965) + - lxd: add support for setting up lxd using 'lxd init' (LP: #1522879) + [Robert C Jennings] + - systemd: support using systemd-detect-virt to detect container + (LP: #1539016) [Martin Pitt] 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) |