diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-10-10 17:08:18 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-10-10 17:08:18 -0700 |
| commit | 8efee1861e892e2d6c279a4eb833f86aff542b53 (patch) | |
| tree | 21e5dd37be64d9ba5ee6617e6daa6d0483a8d3a5 | |
| parent | 92c7b72cf4cd54618d3d68f79a58b22da338c011 (diff) | |
| parent | c665f31772c26ac2b03c44e3a2f68426daa7ce0b (diff) | |
| download | vyatta-cfg-system-8efee1861e892e2d6c279a4eb833f86aff542b53.tar.gz vyatta-cfg-system-8efee1861e892e2d6c279a4eb833f86aff542b53.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into changes-john-southworth
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def | 4 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 7594483d..e56c740d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.19.122) unstable; urgency=low + + * Bugfix 7551: Fix vlan address completion text + + -- John Southworth <john.southworth@vyatta.com> Mon, 10 Oct 2011 19:06:30 -0500 + vyatta-cfg-system (0.19.121) unstable; urgency=low [ Stephen Hemminger ] diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def index 773da775..f025dece 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def @@ -11,7 +11,7 @@ create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../../@).$VAR(../@) $VAR(@ delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../../@).$VAR(../@) $VAR(@) allowed: echo "dhcp <>" -val_help: ipv4; IP address and prefix length -val_help: ipv6; IPv6 address and prefix length +val_help: ipv4net; IP address and prefix length +val_help: ipv6net; IPv6 address and prefix length val_help: dhcp; Dynamic Host Configuration Protocol val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6 diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def index 574b24ed..db361f38 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def @@ -12,7 +12,7 @@ delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../../@).$VAR(../@) $VA allowed: echo "dhcp <>" -val_help: ipv4; IP address and prefix length -val_help: ipv6; IPv6 address and prefix length +val_help: ipv4net; IP address and prefix length +val_help: ipv6net; IPv6 address and prefix length val_help: dhcp; Dynamic Host Configuration Protocol val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6 |