diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-03-30 14:40:12 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-03-30 14:40:12 -0700 |
| commit | b3c5fe4c1f871b932e25173b5a47e0702b2fa1dc (patch) | |
| tree | 6dcdc49df5462d81cdd46335923b48e3db4a447e | |
| parent | 1a129d69b000a2ee7bba31fddbeed4f34a5551ce (diff) | |
| parent | 9b080623e4a86ab5bc2cfc0f866f839b193692ba (diff) | |
| download | vyatta-cfg-b3c5fe4c1f871b932e25173b5a47e0702b2fa1dc.tar.gz vyatta-cfg-b3c5fe4c1f871b932e25173b5a47e0702b2fa1dc.zip | |
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg into jenner
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | templates/priority | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4cf1f6f..6af95aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +vyatta-cfg (0.14.53) unstable; urgency=low + + [ slioch ] + * only set env varible for commit action on directly deleted set nodes + and do not promote to enclosing transaction scope. + + [ Stig Thormodsrud ] + * Remove duplicate priorities for ethernet/vif. + + -- Stig Thormodsrud <stig@vyatta.com> Mon, 30 Mar 2009 14:21:08 -0700 + vyatta-cfg (0.14.52) unstable; urgency=low [ slioch ] 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 |