diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-04-14 18:26:50 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-04-14 18:26:50 -0700 |
| commit | 549e67a288fc4ec1a97e56bbaca6c54dc350d4b7 (patch) | |
| tree | 77e0b65b428f1bf0c3bc26e09d5af5f8e59c2ef1 | |
| parent | b7cfe533b5d0dde7fffc773cad9452a330edd8b7 (diff) | |
| parent | a304d305cb364e5c00d6d5b1ad0bc61041602256 (diff) | |
| download | vyatta-cfg-qos-549e67a288fc4ec1a97e56bbaca6c54dc350d4b7.tar.gz vyatta-cfg-qos-549e67a288fc4ec1a97e56bbaca6c54dc350d4b7.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
templates/qos-policy/traffic-shaper/node.tag/class/node.tag/priority/node.def
templates/qos-policy/traffic-shaper/node.tag/default/priority/node.def
3 files changed, 9 insertions, 3 deletions
diff --git a/scripts/VyattaQosTrafficShaper.pm b/scripts/VyattaQosTrafficShaper.pm index 4ea494c..b3a05a6 100644 --- a/scripts/VyattaQosTrafficShaper.pm +++ b/scripts/VyattaQosTrafficShaper.pm @@ -255,7 +255,7 @@ sub _getAutoRate { if ( $rate eq "auto" ) { $rate = VyattaQosUtil::interfaceRate($dev); if ( ! defined $rate ) { - die "Interface speed defined as auto but can't get rate from $dev\n"; + die "Interface $dev speed cannot be determined; use explicit bandwidth value\n"; } } else { $rate = VyattaQosUtil::getRate($rate); diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/priority/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/priority/node.def index 0358c91..296e6c1 100644 --- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/priority/node.def +++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/priority/node.def @@ -1,3 +1,6 @@ type: u32 help: Set priority for usage of excess bandwidth -syntax:expression: ($VAR(@) > 0 && $VAR(@) < 1000) ; "priority must be between 1 and 1000" +syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8 ; "priority must be between 0 than 7" +help: Priority value +comp_help: Priority for usage of excess bandwidth + <0-7> (default 0) diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/priority/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/priority/node.def index 74f82cd..cdec2b2 100644 --- a/templates/qos-policy/traffic-shaper/node.tag/default/priority/node.def +++ b/templates/qos-policy/traffic-shaper/node.tag/default/priority/node.def @@ -1,3 +1,6 @@ type: u32 help: Set priority for usage of extra bandwidth -syntax:expression: ($VAR(@) > 0 && $VAR(@) < 1000) ; "priority must be between 1 and 1000" +syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8 ; "priority must be between 0 than 7" +help: Priority value +comp_help: Priority for usage of excess bandwidth + <0-7> (default 0) |