Merge branch 'islavista' into jenner

1 files changed, 35 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index f784ba0..67e1d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+vyatta-cfg-qos (0.12) unstable; urgency=low
+
+	  3.2.0
+  [ Mark O'Brien ]
+
+
+  [ Stephen Hemminger ]
+  * Change input rate limiting to use token bucket
+  * Fix QoS on Vif
+  * Add qos-policy hooks for vif over serial
+  * Better help for match options
+  * Better message on missing bandwidth
+  * fix minor qos-policy types
+  * Add support for QoS on tunnels
+  * Add qos-policies for bond devices
+  * Handle updates to existing vif qos
+  * Fix repeated spellin error
+
+  [ Bob Gilligan ]
+  * Bugfix: 3684
+
+  [ Stephen Hemminger ]
+  * Default ceiling for default class should be same as rate
+  * Fix list-policy problem with ingress
+  * fair-queue: validate policy on update
+  * Validate ingress bandwidth value
+  * Add incoming traffic limiting to Qos
+  * Workaround CLI regex problem
+  * Add drop-tail (aka FIFO) QoS policy
+  * Allow either iproute package name
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@firebolt.vyatta.com>  Tue, 25 Nov 2008 19:08:44 -0800
+
 vyatta-cfg-qos (0.11) unstable; urgency=low
 
 	  3.1.2