summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-12-02 11:16:36 -0800
committerJohn Southworth <john.southworth@vyatta.com>2011-12-02 11:16:36 -0800
commit9c36df0ec6587aad840c475de683f95f42017a05 (patch)
tree51380b8eaaffcd8f562ee955b1aa4032cac74572
parent26dec273e603f26fcc0593672635232e7a0bcc0e (diff)
parent6ab5b2ff4a001717be731d0f90857797e7884161 (diff)
downloadvyatta-cfg-qos-9c36df0ec6587aad840c475de683f95f42017a05.tar.gz
vyatta-cfg-qos-9c36df0ec6587aad840c475de683f95f42017a05.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 19fbe87..97e2b70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg-qos (0.15.26) unstable; urgency=low
+
+ * Add vrrp interface parameters for bonding vifs
+
+ -- John Southworth <john.southworth@vyatta.com> Fri, 02 Dec 2011 11:15:46 -0800
+
vyatta-cfg-qos (0.15.25) unstable; urgency=low
* Generate traffic-policy nodes for vrrp interfaces