diff options
| author | Tom Grennan <tgrennan@io.vyatta.com> | 2007-12-17 17:19:49 -0800 |
|---|---|---|
| committer | Tom Grennan <tgrennan@io.vyatta.com> | 2007-12-17 17:19:49 -0800 |
| commit | 44a2449730a5c379c96a486a8161daa8ebe2504f (patch) | |
| tree | ab2097505a2e29af7de03cdb3cd08767f06df386 /debian | |
| parent | a9cd192305b779cb62aecd858ad9a4e5a1fbcad4 (diff) | |
| parent | 36af5914de982f2770fba137c4beea9077cc6adb (diff) | |
| download | vyatta-cfg-system-44a2449730a5c379c96a486a8161daa8ebe2504f.tar.gz vyatta-cfg-system-44a2449730a5c379c96a486a8161daa8ebe2504f.zip | |
Merge branch 'master' of http://phuket.vyatta.com/vyatta-cfg-system
Conflicts:
debian/control
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control index ec7b49bd..d950155d 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Depends: bash (>= 3.1), procps (>= 1:3.2.7-3), coreutils (>= 5.97-5.3), vyatta-cfg, sysv-rc, ntp, sysklogd, busybox, ssh, whois, sudo, - snmpd, keepalived, vyatta-bash + snmpd, keepalived, vyatta-bash, bridge-utils Suggests: util-linux (>= 2.13-5), net-tools, ethtool, |