diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-06-01 11:57:23 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-06-01 11:57:23 -0700 |
| commit | 00e011952b6271bef41e5c8c0e1bf67306e87d8c (patch) | |
| tree | fffbd565881408ab05cd2680439bbf8cc704eb43 | |
| parent | 2c22465441bbb7bdd40bf7a12bbdeb8390e32471 (diff) | |
| parent | fdb11ac2eaa58abc67f41428941a6646fc9f667c (diff) | |
| download | vyatta-cfg-00e011952b6271bef41e5c8c0e1bf67306e87d8c.tar.gz vyatta-cfg-00e011952b6271bef41e5c8c0e1bf67306e87d8c.zip | |
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg into jenner
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | templates/priority | 44 |
2 files changed, 7 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog index 6784a3b..b7f69df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg (0.14.91+jenner2) unstable; urgency=low + + * Remove special case for interfaces ... /ip + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Mon, 01 Jun 2009 09:34:56 -0700 + vyatta-cfg (0.14.91+jenner1) unstable; urgency=low * UNRELEASED diff --git a/templates/priority b/templates/priority index 98d0bc0..1236b9d 100644 --- a/templates/priority +++ b/templates/priority @@ -105,6 +105,7 @@ 380 interfaces/openvpn 390 interfaces/pseudo-ethernet 391 interfaces/pseudo-ethernet/node.tag/vif +395 interfaces/bonding/node.tag/vif 400 system 450 protocols/static 470 policy @@ -119,57 +120,14 @@ 660 protocols/ripng 800 interfaces/ethernet/node.tag/vrrp 800 interfaces/ethernet/node.tag/vif/node.tag/vrrp -810 interfaces/bridge/node.tag/ip -810 interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip -810 interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip -810 interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip -810 interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip -810 interfaces/multilink/node.tag/vif/node.tag/ip -810 interfaces/loopback/node.tag/ip 810 interfaces/serial/node.tag/frame-relay/vif -810 interfaces/serial/node.tag/frame-relay/vif/node.tag/ip 810 interfaces/serial/node.tag/ppp 810 interfaces/serial/node.tag/ppp/vif -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/node.tag/ip -810 interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip -810 interfaces/ethernet/node.tag/ip -810 interfaces/ethernet/node.tag/pppoe/node.tag/ip -810 interfaces/bonding/node.tag/vif/node.tag/ip -810 interfaces/bonding/node.tag/ip -810 interfaces/tunnel/node.tag/ip -810 interfaces/wirelessmodem/node.tag/ip -810 interfaces/openvpn/node.tag/ip -810 interfaces/pseudo-ethernet/node.tag/ip -810 interfaces/pseudo-ethernet/node.tag/vif/node.tag/ip -820 interfaces/bridge/node.tag/ipv6 -820 interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ipv6 -820 interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ipv6 -820 interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ipv6 -820 interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ipv6 -820 interfaces/multilink/node.tag/vif/node.tag/ipv6 -820 interfaces/loopback/node.tag/ipv6 820 interfaces/serial/node.tag/frame-relay/vif -820 interfaces/serial/node.tag/frame-relay/vif/node.tag/ipv6 820 interfaces/serial/node.tag/ppp 820 interfaces/serial/node.tag/ppp/vif -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/node.tag/ipv6 -820 interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ipv6 -820 interfaces/ethernet/node.tag/ipv6 -820 interfaces/ethernet/node.tag/pppoe/node.tag/ipv6 -820 interfaces/bonding/node.tag/vif -820 interfaces/bonding/node.tag/vif/node.tag/ipv6 -820 interfaces/bonding/node.tag/ipv6 -820 interfaces/tunnel/node.tag/ipv6 -820 interfaces/wirelessmodem/node.tag/ipv6 -820 interfaces/openvpn/node.tag/ipv6 -810 interfaces/pseudo-ethernet/node.tag/ipv6 -810 interfaces/pseudo-ethernet/node.tag/vif/node.tag/ipv6 850 interfaces 900 protocols/snmp 900 vpn |