mention new merge format in ChageLog

2013-05-15 15:31:19 -04:00 · 2013-05-15 15:31:19 -04:00 · f27032a187
parent 2c2d0bafba
commit f27032a187
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -56,6 +56,8 @@
   package_upgrade. (LP: #1164147)
 - improvements for systemd with Fedora 18
 - workaround 2.6 kernel issue that stopped blkid from showing /dev/sr0
+ - add new, backwards compatible merging syntax so merging of cloud-config
+   can be more useful.

 0.7.1:
 - sysvinit: fix missing dependency in cloud-init job for RHEL 5.6