summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-12-07 11:34:26 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-12-07 11:34:26 -0800
commit2e10ddd350ceca36f9e43e272111a18e0695ce58 (patch)
tree877fa2fbc3f1f04b939c0d09780e1ad33760d345
parent66e5a1196d7ff4b7dadd8526650a275f2387a86d (diff)
parent5a4ff4b3c07214ee76905821cd581f7b3336ecba (diff)
downloadvyatta-cfg-system-2e10ddd350ceca36f9e43e272111a18e0695ce58.tar.gz
vyatta-cfg-system-2e10ddd350ceca36f9e43e272111a18e0695ce58.zip
Merge branch 'kenwood' of suva.vyatta.com:/git/vyatta-cfg-system into kenwood
-rw-r--r--debian/changelog8
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5f085ee9..5fe6129c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vyatta-cfg-system (0.15.121) unstable; urgency=low
+
+ * Fix load user key script
+ * Add back public-key templates
+ * Fix code that generates authorized keys
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Fri, 04 Dec 2009 20:25:12 -0800
+
vyatta-cfg-system (0.15.120) unstable; urgency=low
* Oops forgot to update installed version