diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2011-01-31 16:18:35 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2011-01-31 16:18:35 -0800 |
| commit | 18d8258e7b7191e5358f1e99999a3721eb9ef167 (patch) | |
| tree | f3565326dc51119f42100ffd9973d85adea72add | |
| parent | 8965f3f255c98524923330627fb5f1c5e33cd122 (diff) | |
| parent | e61b1d0000d3feb58cac69d2155b8271d7923d5a (diff) | |
| download | vyatta-cfg-quagga-18d8258e7b7191e5358f1e99999a3721eb9ef167.tar.gz vyatta-cfg-quagga-18d8258e7b7191e5358f1e99999a3721eb9ef167.zip | |
Merge branch 'napa' of suva.vyatta.com:/git/vyatta-cfg-system into napa
| -rw-r--r-- | debian/changelog | 35 | ||||
| -rw-r--r-- | templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def | 2 | ||||
| -rw-r--r-- | templates/service/dns/forwarding/cache-size/node.def | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 654d1adc..2bb8b73c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,38 @@ +vyatta-cfg-system (0.19.36) unstable; urgency=low + + [ Robert Bays ] + * Fix grammar error in help string. + + [ Mohit Mehta ] + * use val_help to present valid info for node + + -- Mohit Mehta <mohit@vyatta.com> Mon, 31 Jan 2011 12:56:34 -0800 + +vyatta-cfg-system (0.19.35) unstable; urgency=low + + * Fix Bug 6696 Internal error for release/renew dhcp interface under + op mode + + -- Mohit Mehta <mohit@vyatta.com> Thu, 27 Jan 2011 13:54:04 -0800 + +vyatta-cfg-system (0.19.34) unstable; urgency=low + + [ Stephen Hemminger ] + * Pass interface name correctly when deleting dhcpv6 + + [ Stig Thormodsrud ] + * Fix 6501: "clear vrrp master interface <interface> group <group>" + doesnt work with sync groups. + + [ Stephen Hemminger ] + * Rearrange priority for pseudo-ethernet + * Rearrange priority for pseudo-ethernet + + [ Stig Thormodsrud ] + * Fix vrrp duplicate generation of last sync-group entry. + + -- Stig Thormodsrud <stig@vyatta.com> Wed, 26 Jan 2011 15:43:08 -0800 + vyatta-cfg-system (0.19.33) unstable; urgency=low [ Stephen Hemminger ] diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def index 04ef5e18..247755a1 100644 --- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def +++ b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def @@ -1,2 +1,4 @@ help: Server to send DDNS update to (IP address|hostname) type: txt +val_help: ipv4; IP address of DDNS server +val_help: <hostname>; Hostname of DDNS server diff --git a/templates/service/dns/forwarding/cache-size/node.def b/templates/service/dns/forwarding/cache-size/node.def index 1b1a33e6..9285dbbd 100644 --- a/templates/service/dns/forwarding/cache-size/node.def +++ b/templates/service/dns/forwarding/cache-size/node.def @@ -2,3 +2,4 @@ type: u32 default:150 help: DNS forwarding cache size syntax:expression: ($VAR(@) >=0 && $VAR(@) < 10001) ; "Cache size must be between 0 and 10000" +val_help: u32:0-10000; DNS forwarding cache size |