summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-11-07 11:09:22 -0800
committerStig Thormodsrud <stig@vyatta.com>2009-11-07 11:09:22 -0800
commitf682aab147d29a49c589322e3209f0e969c9f686 (patch)
tree478fbbc343cfc5ebe4f85c424902a1cfc3524812
parent07b1f39497ce34c11845857ba0a7a727652d0979 (diff)
parente24a95c3394006d93fcda5b4b1f1c957270522d3 (diff)
downloadvyatta-cfg-quagga-f682aab147d29a49c589322e3209f0e969c9f686.tar.gz
vyatta-cfg-quagga-f682aab147d29a49c589322e3209f0e969c9f686.zip
Merge branch 'kenwood' of http://git.vyatta.com/vyatta-cfg-quagga into kenwood
-rw-r--r--debian/changelog6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def1
6 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 134fe8ce..f53f86c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg-quagga (0.18.46) unstable; urgency=low
+
+ * corresponding fix for bug 5037 in kenwood
+
+ -- slioch <slioch@eng-140.vyatta.com> Wed, 04 Nov 2009 16:27:15 -0800
+
vyatta-cfg-quagga (0.18.45) unstable; urgency=low
* Fix call the vyatta-cli-expand-var.pl.
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
index 4013725c..5471b58e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
@@ -1 +1,2 @@
+priority: 708
help: Set an access-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
index 191c561b..6e94adb9 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
@@ -1 +1,2 @@
+priority: 706
help: Set an as-path-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
index 1a6187c9..67889ad9 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
@@ -1 +1,2 @@
+priority: 707
help: Set a prefix-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
index 7d581eb7..bbc6a611 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
@@ -1 +1,2 @@
+priority: 705
help: Set a route-map to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
index 500e4ec4..ca68da46 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
@@ -1,4 +1,5 @@
type: txt
+priority: 709
help: Set a route-map to selectively unsuppress suppressed routes
comp_help: \1 <txt>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"