diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-08 17:12:17 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-08 17:12:17 -0700 |
commit | aa7eb86891fc84bebcd6fb3aaec2918f11b8ea82 (patch) | |
tree | 9556f0796b4a29ad80a08dcd014d03c1023c70f7 /Makefile.am | |
parent | 8c76eecf50f943b0a7e759f398f6d16dac53dac0 (diff) | |
parent | f9be4712741884fac53dc782096c452e00da96f3 (diff) | |
download | vyatta-cfg-system-aa7eb86891fc84bebcd6fb3aaec2918f11b8ea82.tar.gz vyatta-cfg-system-aa7eb86891fc84bebcd6fb3aaec2918f11b8ea82.zip |
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg-system into mendocino
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 338e53b4..9f0fc305 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,6 @@ sbin_SCRIPTS += scripts/check-ipv4-ipv6.pl sbin_SCRIPTS += scripts/vyatta-bonding.pl sbin_SCRIPTS += scripts/vyatta-raid-event sbin_SCRIPTS += scripts/vyatta-update-arp-params -sbin_SCRIPTS += scripts/zone-mgmt/vyatta-zone.pl sbin_SCRIPTS += scripts/vyatta-banner.pl sbin_SCRIPTS += scripts/vyatta-load-user-key.pl sbin_SCRIPTS += scripts/install/install-get-partition |