merge trunk at 0.7.7~bzr1245

1 files changed, 21 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7bfd0c0a..fa5e7df4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,6 +105,27 @@
  - centos: Ensure that resolve conf object is written as a str (LP: #1479988)
  - chef: straighten out validation_cert and validation_key (LP: #1568940)
  - phone_home: allow usage of fqdn (LP: #1566824) [Ollie Armstrong]
+ - cloudstack: Only use DHCPv4 lease files as a datasource (LP: #1576273)
+   [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)
+ - Improve merging documentation [Daniel Watkins]
+ - apt sources: support inserting key/key-id only, custom sources.list,
+   long gpg key fingerprints with spaces, and dictionary format (LP: #1574113)
+ - SmartOS: datasource improvements and support for metadata service
+   providing networking information.
+ - Datasources: centrally handle 'dsmode' and no longer require datasources
+   to "pass" if modules_init should be executed with network access.
+ - ConfigDrive: improved support for networking information from
+   a network_data.json or older interfaces formated network_config.
+ - Change missing Cheetah log warning to debug [Andrew Jorgensen]
+ - Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche]
+ - support network rendering to sysconfig (for centos and RHEL)
+ - write_files: if no permissions are given, just use default without warn.
+ - user_data: fix error when user-data is not utf-8 decodable (LP: #1532072)
 
 0.7.6:
  - open 0.7.6