diff options
| author | Robert Bays <robert@vyatta.com> | 2010-08-30 15:47:01 -0700 |
|---|---|---|
| committer | Robert Bays <robert@vyatta.com> | 2010-08-30 15:47:01 -0700 |
| commit | 0cba88a9b7a7439741f1b371a9c290e41380c91b (patch) | |
| tree | 15373235080940ebb4ef34cd2df29e6b42a8a2d7 /templates | |
| parent | 3fb0bdfb2a7c61f0b5d500d15381cbcdaeceb548 (diff) | |
| parent | a785fe685d9fa0edd813e2a53f1ebbc227ba2c7f (diff) | |
| download | vyatta-cfg-quagga-0cba88a9b7a7439741f1b371a9c290e41380c91b.tar.gz vyatta-cfg-quagga-0cba88a9b7a7439741f1b371a9c290e41380c91b.zip | |
Merge commit 'a785fe685d9fa0edd813e2a53f1ebbc227ba2c7f' into mendocino
Conflicts:
debian/changelog
scripts/bgp/vyatta-bgp.pl
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def index e806b5d7..7e165489 100644 --- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def +++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def @@ -1,6 +1,6 @@ multi: type: u32 help: Peer ASs in the BGP confederation -val_help: u32:1-4294967294; Peer AS number numbers (ex: "435 234") +val_help: u32:1-4294967294; Peer AS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294" commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --confed-iBGP-ASN-check $VAR(@) --as $VAR(../../../@)"; "Can't set confederation peers ASN to $VAR(@). Delete any neighbors with remote-as $VAR(@) and/or change the local ASN first." |