summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-04-01 08:21:38 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-04-01 08:21:38 -0700
commita3ff37f9d21e910a56ef6e26fea7a102d36f7881 (patch)
treeff5daa0fe6af8950e3efc07a705938ee3c102ba1
parent54370a613155cd952173a2ccd6b04b06498f4ec2 (diff)
parent5f222c5493560f890fad3ef1be767934ec71c5a8 (diff)
downloadvyatta-cfg-quagga-a3ff37f9d21e910a56ef6e26fea7a102d36f7881.tar.gz
vyatta-cfg-quagga-a3ff37f9d21e910a56ef6e26fea7a102d36f7881.zip
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-system into jenner
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2477f798..bb33b28a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg-system (0.15.14) unstable; urgency=low
+
+ * Turn off forwarding delay if STP is off
+ * Set forwarding-delay when STP is enabled
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Tue, 31 Mar 2009 14:12:24 -0700
+
vyatta-cfg-system (0.15.13) unstable; urgency=low
* UNRELEASED