summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-12-05 16:37:28 -0800
committerJohn Southworth <john.southworth@vyatta.com>2011-12-05 16:37:28 -0800
commit3a9590e956f5aa688300a4d2f96eaed210d536f8 (patch)
treea22f7d88653723457a4bf28d0209bd1cc8377208
parentc1f4cfadd9b879e6ccdb938e68c655cd0b3bd005 (diff)
parent558d4ea690986418bf3142fd69faa287ddf35c40 (diff)
downloadvyatta-cfg-qos-3a9590e956f5aa688300a4d2f96eaed210d536f8.tar.gz
vyatta-cfg-qos-3a9590e956f5aa688300a4d2f96eaed210d536f8.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-qos into changes-john-southworth
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 97e2b70..d90f600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg-qos (0.15.27) unstable; urgency=low
+
+ * add priorities to vrrp traffic-policy so that it is executed after
+ keepalived has started
+
+ -- John Southworth <john.southworth@vyatta.com> Mon, 05 Dec 2011 16:37:02 -0800
+
vyatta-cfg-qos (0.15.26) unstable; urgency=low
* Add vrrp interface parameters for bonding vifs