From 59100ebb25781e2dfc6d9ccb21cee5a07bc03443 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Wed, 15 May 2013 15:31:19 -0400
Subject: mention new merge format in ChageLog

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 06c9de25..5c25f0cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 
-- 
cgit v1.2.3