diff options
| author | Robert Bays <rbays@moresby.(none)> | 2007-11-09 17:54:36 -0800 |
|---|---|---|
| committer | Robert Bays <rbays@moresby.(none)> | 2007-11-09 17:54:36 -0800 |
| commit | 02e778de3dac1672bde54294472e8122a0668735 (patch) | |
| tree | abb20e68c6602a85f68cc4fa9076bd89fac8c29b /templates | |
| parent | 6c4f2ec235c8c6b4ad821cbf2878bf5f9d9586b5 (diff) | |
| parent | a70d37854d9b81fe30f7d6798cdaec2fce310691 (diff) | |
| download | vyatta-cfg-quagga-02e778de3dac1672bde54294472e8122a0668735.tar.gz vyatta-cfg-quagga-02e778de3dac1672bde54294472e8122a0668735.zip | |
Merge branch 'master' of ssh://phuket.vyatta.com/usr/local/git//vyatta-cfg-quagga
Conflicts:
templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def index 89e352e3..604ae3c8 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def @@ -1,7 +1,7 @@ type: u32 help: "Match tag of route" syntax: $(@) >= 1 && $(@) <= 65535; "tag must be between 1 and 65535" -commit: $(../../action/) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" +commit: $(../../action) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match tag $(@)\" " |