diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2009-10-31 16:01:27 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2009-10-31 16:01:27 -0700 |
| commit | 37dbea348afb8d0770767441c30e5ab1e2cea874 (patch) | |
| tree | 0cc6f5bf213ef68f9a0537897e3f722365eb6bcf | |
| parent | b817fa2eb752bc1f4a8d3c97b7749d003c2bb7d4 (diff) | |
| parent | c31a9da343fde640dfe652cafa7ac4cbdf7f61f2 (diff) | |
| download | vyatta-cfg-quagga-37dbea348afb8d0770767441c30e5ab1e2cea874.tar.gz vyatta-cfg-quagga-37dbea348afb8d0770767441c30e5ab1e2cea874.zip | |
Merge branch 'kenwood' of http://git.vyatta.com/vyatta-cfg-system into kenwood
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def | 2 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/vrrp/node.def | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4787a9c8..fba566b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +vyatta-cfg-system (0.15.94) unstable; urgency=low + + [ An-Cheng Huang ] + * add unified install-image + + [ slioch ] + * added missed vrrp priorities. + + -- slioch <slioch@eng-140.vyatta.com> Sat, 31 Oct 2009 14:02:41 -0700 + vyatta-cfg-system (0.15.93) unstable; urgency=low * radius client: try first password only if not first diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def index f90c20db..6d58896a 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def @@ -1,3 +1,3 @@ help: Configure Virtual Router Redundancy Protocol (VRRP) parameters - +priority: 800 end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../../@).$VAR(../@) " diff --git a/templates/interfaces/ethernet/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vrrp/node.def index fc9bd82e..3b3e083e 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/node.def @@ -1,3 +1,3 @@ help: Configure Virtual Router Redundancy Protocol (VRRP) - +priority: 800 end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../@) " |