summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-12-03 17:38:58 -0800
committerRick Balocca <rbalocca@vyatta.com>2008-12-03 17:38:58 -0800
commitdfb6b8cf54dd5542d91526acfa1306666a211de8 (patch)
tree7831a5dc30f9e87e7588e2a823cdcae71fc412af
parent9663fb121086839c69626b52375212a2228e2d7f (diff)
parent26c94d979f4630a54bec47572a80142947d3b1b0 (diff)
downloadvyatta-op-qos-dfb6b8cf54dd5542d91526acfa1306666a211de8.tar.gz
vyatta-op-qos-dfb6b8cf54dd5542d91526acfa1306666a211de8.zip
Merge branch 'islavista' into jenner
-rw-r--r--debian/changelog23
1 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d9073bf..9fe580a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+vyatta-op-qos (0.12) unstable; urgency=low
+
+ 3.2.0
+ [ Mark O'Brien ]
+
+
+ [ Stephen Hemminger ]
+ * Fix vif in show queueing
+ * Don't print class on Ingress
+ * Sort interface names
+ * Update show queueing to handle ingress
+ * Other part of qdisc parsing fix
+ * Reformat (tidy) show-queuing
+ * Fix problem in parsing of qdisc command
+ * Provide mapping from class id to queue displine id
+ * Rename queuing to queueing
+ * Improved Qos queue operational command
+ * Allow either iproute or vyatta-iproute
+
+ [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@firebolt.vyatta.com> Tue, 25 Nov 2008 19:09:53 -0800
+
vyatta-op-qos (0.11) unstable; urgency=low
3.1.2