summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-04-29 15:12:53 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-04-29 15:12:53 -0700
commitf1f44affb98c4f66ec22d7ea9d504ca1c9b7ba9b (patch)
tree3cb9d0a313487a03f5d6ea83f93212b4e44d0b65
parentc67d17bcf7abf8bc872a3a9d505d0b520992caef (diff)
parent544a291a81333cc6a156ae58278b2e9f7edeb686 (diff)
downloadvyatta-cfg-f1f44affb98c4f66ec22d7ea9d504ca1c9b7ba9b.tar.gz
vyatta-cfg-f1f44affb98c4f66ec22d7ea9d504ca1c9b7ba9b.zip
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg into jenner
-rw-r--r--debian/changelog12
-rw-r--r--debian/control3
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c55f59b..c6ff540 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+vyatta-cfg (0.14.76) unstable; urgency=low
+
+ * testing if this fixes diable-link-detect file move problem
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com> Wed, 29 Apr 2009 14:48:20 -0700
+
+vyatta-cfg (0.14.75) unstable; urgency=low
+
+ * Rename virtual-ethernet to pseudo-ethernet
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Wed, 29 Apr 2009 12:32:54 -0700
+
vyatta-cfg (0.14.74) unstable; urgency=low
* Extend getIP() to be able to get all addresses
diff --git a/debian/control b/debian/control
index 369a197..bd43446 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,8 @@ Depends: sed (>= 4.1.5),
vlan,
libglib2.0-0,
curl
-Replaces: vyatta-cfg-firewall
+Replaces: vyatta-cfg-firewall,
+ vyatta-cfg-quagga
Suggests: util-linux (>= 2.13-5),
net-tools,
ethtool,