summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAuto Build <autobuild@firebolt.vyatta.com>2008-06-22 17:25:42 -0700
committerAuto Build <autobuild@firebolt.vyatta.com>2008-06-22 17:25:42 -0700
commitc9b6da7f0127f549b44cada295540671fb41f32d (patch)
tree7f5b69c96486297cfdafe161d6c3941f944513f7
parent2bf54b64f6b2b81daaa99f06f0f06aa86a1a939f (diff)
parent51606f8046d1fffcd747bcc27a7f0a3a53533c14 (diff)
downloadvyatta-cfg-system-c9b6da7f0127f549b44cada295540671fb41f32d.tar.gz
vyatta-cfg-system-c9b6da7f0127f549b44cada295540671fb41f32d.zip
Merge branch 'hollywood' of git://git.vyatta.com/vyatta-cfg-system into hollywood
-rw-r--r--debian/control2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index f0f3149b..4b5692bb 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Depends: sed (>= 4.1.5),
whois,
sudo,
snmpd,
- vyatta-keepalived | keepalived,
+ vyatta-keepalived,
bridge-utils,
ssh,
ed,