summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-12-01 16:57:53 -0800
committerJohn Southworth <john.southworth@vyatta.com>2011-12-01 16:57:53 -0800
commit98bf62c678c4bbd6f204520e104c1194bc618461 (patch)
treefdfcf9d2a1d4c297bf836e470c20f5824d02c759
parentab43b36ef8be4c8f2b41f99cce8dfd9196fe7314 (diff)
parent1a46f4ce3a6dfde78641c4e8197c42dc27cab494 (diff)
downloadvyatta-cfg-qos-98bf62c678c4bbd6f204520e104c1194bc618461.tar.gz
vyatta-cfg-qos-98bf62c678c4bbd6f204520e104c1194bc618461.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-qos into changes-john-southworth
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f8ec12b..19fbe87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg-qos (0.15.25) unstable; urgency=low
+
+ * Generate traffic-policy nodes for vrrp interfaces
+
+ -- John Southworth <john.southworth@vyatta.com> Thu, 01 Dec 2011 16:55:38 -0800
+
vyatta-cfg-qos (0.15.24) unstable; urgency=low
* Fix non-numeric comparison