merge trunk at 0.7.7~bzr1189

1 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index ebaacf6a..6d6da417 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,13 @@
  - groups: add defalt user to 'lxd' group.  Create groups listed
    for a user if they do not exist. (LP: #1539317)
  - dmi data: fix failure of reading dmi data for unset dmi values
+ - doc: mention label for nocloud datasource must be 'cidata' [Peter Hurley]
+ - ssh_pwauth: fix module to support 'unchanged' and match behavior
+   described in documentation [Chris Cosby]
+ - quickly check to see if the previous instance id is still valid to
+   avoid dependency on network metadata service on every boot (LP: #1553815)
+ - support network configuration in cloud-init --local with support
+   device naming via systemd.link.
 
 0.7.6:
  - open 0.7.6