summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2009-05-28 14:52:49 -0700
committerBob Gilligan <gilligan@vyatta.com>2009-05-28 14:52:49 -0700
commit2afd98987f8fd35019cb0b816aea183be0e74e52 (patch)
treefaa641d39bed176b926118a0d0937f4b09b59821 /templates
parentf209201a04b37c570690fc509042eff049a418ce (diff)
parentea515c9e264270f8d68798979be5a79902c0b19e (diff)
downloadvyatta-cfg-2afd98987f8fd35019cb0b816aea183be0e74e52.tar.gz
vyatta-cfg-2afd98987f8fd35019cb0b816aea183be0e74e52.zip
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg into jenner
Diffstat (limited to 'templates')
-rw-r--r--templates/priority4
1 files changed, 1 insertions, 3 deletions
diff --git a/templates/priority b/templates/priority
index a24f03d..3605751 100644
--- a/templates/priority
+++ b/templates/priority
@@ -91,8 +91,6 @@
210 firewall/ipv6-name/node.tag
210 firewall/ipv6-modify/node.tag
215 firewall
-300 protocols/ospf
-301 protocols/ospfv3
310 interfaces/bridge
315 interfaces/bonding
318 interfaces/ethernet
@@ -119,7 +117,7 @@
530 protocols/bgp/node.tag/timers
610 protocols/ospf/parameters
620 protocols/ospf
-630 protocols/ospfv3/area
+630 protocols/ospfv3/parameters
640 protocols/ospfv3
650 protocols/rip
660 protocols/ripng