merge from trunk

1 files changed, 17 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d03c0293..5408a941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,23 @@
  - cc_landscape: restart landscape after install or config (LP: #1070345)
  - multipart/archive.  do not fail on unknown headers in multipart
    mime or cloud-archive config (LP: #1065116).
+ - tools/Z99-cloud-locale-test.sh: avoid warning when user's shell is
+   zsh (LP: #1073077)
+ - fix stack trace when unknown user-data input had unicode (LP: #1075756)
+ - split 'apt-update-upgrade' config module into 'apt-configure' and
+   'package-update-upgrade-install'.  The 'package-update-upgrade-install'
+   will be a cross distro module.
+ - Cleanups:
+   - Remove usage of paths.join, as all code should run through util helpers
+   - Fix pylint complaining about tests folder 'helpers.py' not being found
+   - Add a pylintrc file that is used instead options hidden in 'run_pylint'
+ - fix bug where cloud-config from user-data could not affect system_info
+   settings [revno 703] (LP: #1076811)
+ - for write fqdn to system config for rh/fedora [revno 704]
+ - add yaml/cloud config examples checking tool [revno 706]
+ - Fix the merging of group configuration when that group configuration is a
+   dict => members. [revno 707]
+ - add yum_add_repo configuration module for adding additional yum repos
 0.7.0:
  - add a 'exception_cb' argument to 'wait_for_url'.  If provided, this
    method will be called back with the exception received and the message.