From 98b7f2e6d44d251d4a74e759dc84777fca15f5c6 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 18 Feb 2011 18:44:25 -0500
Subject: update changelog for Marc's contributions

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

diff --git a/ChangeLog b/ChangeLog
index 01282954..2452ba3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@
  - allow /etc/hosts to be written from hosts.tmpl. which allows
    getting local-hostname into /etc/hosts (LP: #720440)
  - better handle startup if there is no eth0 (LP: #714807)
+ - update rather than append in puppet config [Marc Cluet]
+ - add cloud-config for mcollective [Marc Cluet]
 0.6.0:
  - change permissions of /var/log/cloud-init.log to accomodate
    syslog writing to it (LP: #704509)
-- 
cgit v1.2.3