summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-10-30 12:20:09 -0700
committerStig Thormodsrud <stig@vyatta.com>2009-10-30 12:20:09 -0700
commitb0d832cf9f1a9d5979f759fb8ef93b7739f1d699 (patch)
tree3f392eaf0f7384d5224e9422b341814af0797b39
parent722b77390b977f4ff67c63afcdc4dde61408cb8f (diff)
parent192d585dfb7ac397c80662a905f0dbbabc461756 (diff)
downloadvyatta-cfg-quagga-b0d832cf9f1a9d5979f759fb8ef93b7739f1d699.tar.gz
vyatta-cfg-quagga-b0d832cf9f1a9d5979f759fb8ef93b7739f1d699.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.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/node.def2
4 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 0822c96b..e2d21f7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg-quagga (0.18.40) unstable; urgency=low
+
+ * modify bgp priorities to schedule as last protocol for quagga.
+
+ -- slioch <slioch@eng-140.vyatta.com> Tue, 27 Oct 2009 15:23:52 -0700
+
vyatta-cfg-quagga (0.18.39) unstable; urgency=low
* Fix 5036: Unable to configure more than one interface per area in
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
index 9a4c4882..205acc52 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -1,5 +1,5 @@
tag:
-priority: 520
+priority: 720
type: u32
help: Configure Border Gateway Protocol (BGP) parameters
comp_help: \1 <1-4294967294>\tAS number
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def
index 68018fd7..c256e4d9 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.def
@@ -1,5 +1,5 @@
tag:
-priority: 510
+priority: 710
type: txt
help: Set a BGP neighbor
comp_help:
diff --git a/templates/protocols/bgp/node.tag/parameters/node.def b/templates/protocols/bgp/node.tag/parameters/node.def
index 44c7ca1d..e99114be 100644
--- a/templates/protocols/bgp/node.tag/parameters/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/node.def
@@ -1,2 +1,2 @@
-priority: 500
+priority: 700
help: Set BGP parameters