summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-11-02 11:35:47 -0400
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-11-02 11:35:47 -0400
commitc0251a9afbef02437d809ed1b508ac991e024e23 (patch)
treef39fbb9bc7074f96b1740247e7b64935ab8431cd
parentb557e1b2a8e2a8c15cbb7552cbce70321cf12a96 (diff)
parent9fa8b3b26d7197f9d3de8de28828a758d705da7a (diff)
downloadvyatta-cfg-system-c0251a9afbef02437d809ed1b508ac991e024e23.tar.gz
vyatta-cfg-system-c0251a9afbef02437d809ed1b508ac991e024e23.zip
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg-system into mendocino
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a484e9e9..899ef47f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg-system (0.18.5) unstable; urgency=low
+
+ * Fix goto in vyatta-net.rules
+ * Add net-snmp ifAlias hook
+
+ -- Stephen Hemminger <shemminger@vyatta.com> Fri, 29 Oct 2010 11:33:08 -0700
+
vyatta-cfg-system (0.18.4) unstable; urgency=low
* fix for bug 6388