diff options
| author | susheela <susheela.vaidya@vyatta.com> | 2012-10-06 15:08:21 -0700 |
|---|---|---|
| committer | susheela <susheela.vaidya@vyatta.com> | 2012-10-06 15:08:21 -0700 |
| commit | 997ff3e8311cbd743781bc3c9d54245979785985 (patch) | |
| tree | b79324e6437e3cf71f5ad99f062f6dfb9b9b9adf | |
| parent | 57eecc07585ae93d9cf2f0a21a3e3c048a91e680 (diff) | |
| parent | b2c12bc28b75c92707ffb12dc79060f5f45da3dd (diff) | |
| download | vyatta-cfg-firewall-997ff3e8311cbd743781bc3c9d54245979785985.tar.gz vyatta-cfg-firewall-997ff3e8311cbd743781bc3c9d54245979785985.zip | |
Merge branch 'pacifica' of git.vyatta.com:/git/vyatta-cfg-firewall into pacifica
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | templates/policy/route/node.tag/rule/node.tag/protocol/node.def | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 574aea0..2af882f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +vyatta-cfg-firewall (0.13.89) unstable; urgency=low + + [ Bharat ] + * Bug 8200: Changed gred to not display shim6 + + [ bharat ] + + -- bharat <bharat@git.vyatta.com> Thu, 04 Oct 2012 11:55:24 -0700 + vyatta-cfg-firewall (0.13.88) unstable; urgency=low * Bug 8348: policy route <> rule <> action, 'modify' shouldn't be diff --git a/templates/policy/route/node.tag/rule/node.tag/protocol/node.def b/templates/policy/route/node.tag/rule/node.tag/protocol/node.def index 6e0e9a6..09bc06a 100644 --- a/templates/policy/route/node.tag/rule/node.tag/protocol/node.def +++ b/templates/policy/route/node.tag/rule/node.tag/protocol/node.def @@ -17,6 +17,6 @@ syntax:expression: exec "if [ -n \"`/opt/vyatta/sbin/vyatta-validate-type protoc # Provide some help for command completion. Doesn't return negated # values or protocol numbers allowed: - protos=`cat /etc/protocols | sed -e '/^#.*/d' | awk '{ print $1 }' | grep -v 'v6'` + protos=`cat /etc/protocols | sed -e '/^#.*/d' | awk '{ print $1 }' | grep -v '6'` protos="all $protos tcp_udp" echo -n $protos |