summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-10-16 16:40:23 -0700
committerRick Balocca <rbalocca@vyatta.com>2008-10-16 16:40:23 -0700
commit817dc77ad42cd9c7e6ebb394a094af8a6d287559 (patch)
tree54faa756bf5edb374c33e1836eacf0a967589d08 /debian
parent8e26ab1c3bbb807b0e68829453c95bdf3795a4a6 (diff)
parentec928267b1e61e7a957515ad553bd171baf2d651 (diff)
downloadvyatta-cfg-quagga-817dc77ad42cd9c7e6ebb394a094af8a6d287559.tar.gz
vyatta-cfg-quagga-817dc77ad42cd9c7e6ebb394a094af8a6d287559.zip
Merge branch 'hollywood' into islavista
Conflicts: debian/vyatta-cfg-system.postinst.in
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog18
1 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 803fdb87..28c93bf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+vyatta-cfg-system (0.14) unstable; urgency=low
+
+ 3.1.4
+ [ Mark O'Brien ]
+
+
+ [ Robert Bays ]
+ * fix ssh keygen on startup
+
+ [ An-Cheng Huang ]
+ * remove unused files
+ * use epoch in package version number
+ * add ssh key blacklists
+
+ [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@firebolt.vyatta.com> Tue, 14 Oct 2008 17:30:18 -0700
+
vyatta-cfg-system (0.13) unstable; urgency=low
3.1.3