diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-10-17 16:49:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-17 16:49:28 +0200 |
commit | 7abe747038ae99bae80c32d92fa1a352898153f0 (patch) | |
tree | 805b7d6d41aef412f869a3d6913c698da14a8813 | |
parent | 0f8641babb207e36c2b1637aea7cc2761c54f31b (diff) | |
parent | 455389f6becbbec93f16bc31289c0ae46d278e08 (diff) | |
download | vyatta-cfg-quagga-7abe747038ae99bae80c32d92fa1a352898153f0.tar.gz vyatta-cfg-quagga-7abe747038ae99bae80c32d92fa1a352898153f0.zip |
Merge pull request #36 from zdc/T1490
[BGP] T1490: Deleted bgp scan-time parameter
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | cfg-version/quagga@4 (renamed from cfg-version/quagga@3) | 0 | ||||
-rwxr-xr-x | scripts/bgp/vyatta-bgp.pl | 4 | ||||
-rw-r--r-- | templates/protocols/bgp/node.tag/parameters/scan-time/node.def | 4 |
4 files changed, 1 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 434de372..cd4b1ba8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ share_perl5_DATA = lib/Vyatta/Quagga/Config.pm src_check_prefix_boundary = src/check_prefix_boundary.c -curver_DATA = cfg-version/quagga@3 +curver_DATA = cfg-version/quagga@4 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd diff --git a/cfg-version/quagga@3 b/cfg-version/quagga@4 index e69de29b..e69de29b 100644 --- a/cfg-version/quagga@3 +++ b/cfg-version/quagga@4 diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 9a816344..a99b7897 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -764,10 +764,6 @@ my %qcom = ( set => 'router bgp #3 ; bgp router-id #6', del => 'router bgp #3 ; no bgp router-id #6', }, - 'protocols bgp var parameters scan-time' => { - set => 'router bgp #3 ; bgp scan-time #6', - del => 'router bgp #3 ; no bgp scan-time #6', - }, 'protocols bgp var peer-group' => { set => undef, del => undef, diff --git a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def deleted file mode 100644 index 5a009f86..00000000 --- a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: BGP route scanner interval -val_help: u32:5-60; Scan interval in seconds -syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 60; "scan-time must be between 5 and 60 seconds" |