Merge branch 'kenwood' of suva.vyatta.com:/git/vyatta-cfg-qos into kenwood

2 files changed, 62 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index ddb1bbf..16cd265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,64 @@
+vyatta-cfg-qos (0.13.14) unstable; urgency=low
+
+  * added required keyword to help text.
+
+ -- Michael Larson <slioch@slioch.vyatta.com>  Mon, 30 Nov 2009 16:00:24 -0800
+
+vyatta-cfg-qos (0.13.13) unstable; urgency=low
+
+  * dependency update
+
+ -- Michael Larson <slioch@slioch.vyatta.com>  Fri, 13 Nov 2009 14:01:25 -0800
+
+vyatta-cfg-qos (0.13.12) unstable; urgency=low
+
+  * Fix parse error found by check_tmpl script.
+
+ -- Stig Thormodsrud <stig@vyatta.com>  Thu, 05 Nov 2009 16:47:32 -0800
+
+vyatta-cfg-qos (0.13.11) unstable; urgency=low
+
+  * add support for priority in project
+
+ -- slioch <slioch@eng-140.vyatta.com>  Tue, 20 Oct 2009 16:16:15 -0700
+
+vyatta-cfg-qos (0.13.10) unstable; urgency=low
+
+  * Use sudo when getting speed
+  * Allow random-detect for Qos policy types without rate
+  * Allow random-detect for round-robin subqueue
+  * Allow setting queue limit and average packet size
+  * Handle round-robin without configuration of default
+  * Fix management of delete of policy in use
+  * Fix netem bandwidth (TBF) setup
+  * Change initialization of WRED parameters
+  * IPV6 match fix
+  * Cleanup how qos-policy change detection works
+  * remove pseudo-ethernet vif
+  * Address issues in traffic-shaper match
+  * Require bandwidth setting for default class
+  * Fix update (apply-policy) at end
+  * Fix issues with vif match
+  * Ignore deleted policy on end test
+  * Fix DSCP field match with set-dscp
+  * Fix policy update
+  * Fix mixed protocol matches
+  * Fix IPV6 traffic-class match
+  * Remove extra quote that caused shell error in fair-queue
+  * Don't allow random-detect type for round-robin queue type
+  * random-detect needs qmax > qmin
+  * Fix match rules for traffic limiter
+  * Fix perl error when attempting to delete qos policy
+  * Allow update to interface if not present yet
+
+ -- Stephen Hemminger <shemminger@lenny.localdomain>  Thu, 01 Oct 2009 13:52:13 -0700
+
+vyatta-cfg-qos (0.13.9) unstable; urgency=low
+
+  * Add wireless config
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Thu, 20 Aug 2009 13:48:54 -0700
+
 vyatta-cfg-qos (0.13.8) unstable; urgency=low
 
   [ Stephen Hemminger ]
diff --git a/debian/control b/debian/control
index d9dce92..a5ce364 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Depends: sed (>= 4.1.5),
  perl (>= 5.8.8),
  procps (>= 1:3.2.7-3),
  coreutils (>= 5.97-5.3),
- vyatta-cfg,
+ vyatta-cfg (>= 0.15.33),
  vyatta-bash | bash (>= 3.1),
  iproute | vyatta-iproute,
  sudo,