summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-10-16 16:44:22 -0700
committerRick Balocca <rbalocca@vyatta.com>2008-10-16 16:44:22 -0700
commitfa3e86a1a7559808ba5e32374e35d387472567c8 (patch)
treeb3c11943294ffc282863dbca418d408a7869f86f
parentd4aad5852a6be45eda78971b3b40350bc5e9ab5b (diff)
parenta763c7ba2a45d0b8d9a50e0e8188c609f74d2af6 (diff)
downloadquagga-fa3e86a1a7559808ba5e32374e35d387472567c8.tar.bz2
quagga-fa3e86a1a7559808ba5e32374e35d387472567c8.tar.xz
Merge branch 'hollywood' into islavista
Conflicts: bgpd/ChangeLog debian/changelog
-rw-r--r--debian/changelog14
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 11b88c0a..27a97490 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,19 @@
vyatta-quagga (0.99.10-1) unstable; urgency=low
+ 3.1.4
+ [ Mark O'Brien ]
+
+
+ [ Paul Jakma ]
+ * [bgpd] bug #419: partial aspath-limit incorrectly causes session
+ reset
+
+ [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@firebolt.vyatta.com> Tue, 14 Oct 2008 17:30:19 -0700
+
+vyatta-quagga (0.99.9-13) unstable; urgency=low
+
3.1.3
[ Mark O'Brien ]