summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-04 15:13:15 -0500
committerScott Moser <smoser@ubuntu.com>2013-03-04 15:13:15 -0500
commitc1625a5f90d4f08b193e4fcfc3238bb32bcf61df (patch)
tree5032f10e7380ee998cebba1c90bca2db7cb3e339 /ChangeLog
parent7bb938c0a677637796ee62fc4242d8c0118987bd (diff)
parent2a64b4e7a702933ec5e5a726155cc7acbe4d8144 (diff)
downloadvyos-cloud-init-c1625a5f90d4f08b193e4fcfc3238bb32bcf61df.tar.gz
vyos-cloud-init-c1625a5f90d4f08b193e4fcfc3238bb32bcf61df.zip
merge from trunk
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b6119e33..110cdec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -501,4 +501,7 @@
- make the message on 'disable_root' more clear (LP: #672417)
- do not require public key if private is given in ssh cloud-config
(LP: #648905)
+ - fix issue when writing ssh keys to .ssh/authorized_keys (LP: #1136343)
+ - upstart: cloud-init-nonet.conf trap the TERM signal, so that dmesg or other
+ output does not get a 'killed by TERM signal' message.
# vi: syntax=text textwidth=79