From a8cd78271c23e13f178aa0d1ee90f8ae5ff640f4 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 17 Jun 2011 10:51:08 -0400
Subject: mention previous commit in ChangeLog

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 9472bd50..0da5f92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
  - support disabling byobu in cloud-config
  - run cc_ssh as a cloud-init module so it is guaranteed to run before
    ssh starts (LP: #781101)
+ - make prefix for keys added to /root/.ssh/authorized_keys configurable
+   and add 'no-port-forwarding,no-agent-forwarding,no-X11-forwarding'
+   to the default (LP: #798505)
 0.6.1:
  - fix bug in fixing permission on /var/log/cloud-init.log (LP: #704509)
  - improve comment strings in rsyslog file tools/21-cloudinit.conf
-- 
cgit v1.2.3