summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorslioch <slioch@eng-140.vyatta.com>2009-03-30 14:40:12 -0700
committerslioch <slioch@eng-140.vyatta.com>2009-03-30 14:40:12 -0700
commitb3c5fe4c1f871b932e25173b5a47e0702b2fa1dc (patch)
tree6dcdc49df5462d81cdd46335923b48e3db4a447e /templates
parent1a129d69b000a2ee7bba31fddbeed4f34a5551ce (diff)
parent9b080623e4a86ab5bc2cfc0f866f839b193692ba (diff)
downloadvyatta-cfg-b3c5fe4c1f871b932e25173b5a47e0702b2fa1dc.tar.gz
vyatta-cfg-b3c5fe4c1f871b932e25173b5a47e0702b2fa1dc.zip
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg into jenner
Diffstat (limited to 'templates')
-rw-r--r--templates/priority2
1 files changed, 0 insertions, 2 deletions
diff --git a/templates/priority b/templates/priority
index 7bd7d35..d8cb01b 100644
--- a/templates/priority
+++ b/templates/priority
@@ -170,7 +170,6 @@
810 interfaces/serial/node.tag/ppp/vif/node.tag/ip
810 interfaces/serial/node.tag/cisco-hdlc/vif
810 interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip
-810 interfaces/ethernet/node.tag/vif
810 interfaces/ethernet/node.tag/vif/node.tag/ip
810 interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip
810 interfaces/ethernet/node.tag/ip
@@ -195,7 +194,6 @@
820 interfaces/serial/node.tag/ppp/vif/node.tag/ipv6
820 interfaces/serial/node.tag/cisco-hdlc/vif
820 interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ipv6
-820 interfaces/ethernet/node.tag/vif
820 interfaces/ethernet/node.tag/vif/node.tag/ipv6
820 interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ipv6
820 interfaces/ethernet/node.tag/ipv6