| commit | ffb116cea49fdc5b6fd8a9aab2e758967a3b75be | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Tue, 14 Feb 2012 08:58:31 +0000 (14 06:58 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Tue, 14 Feb 2012 08:58:31 +0000 (14 06:58 -0200) | ||
| tree | 8b7edce9fbe4b72da95146a4eb25e2d550ca13a3 | tree |
| parent | 6a8d27badf2dd7bda4331a9eb5020c64c1b46faf | commitdiff |
| parent | 11e47c8d5ff58d113d0b07871397db8cef9abd4c | commitdiff |
Merge remote-tracking branch 'origin/QOS-DEV' into Teaman-RT
* origin/QOS-DEV:
fix outgoing QOS prios
allow incoming UDP to be exempted from QOS ingress
Add IMQ based QOS ingress, incoming bandwidth pie chart
Allow user-defined QOS class names
allow up to 80 QOS rules
QoS/Transfer Rates page fixed for K24 builds + improvements for K26 builds
QoS Details/Transfer rates: filters and general improvements
Conflicts:
release/src/router/nvram/defaults.c
release/src/router/www/interfaces.js
release/src/router/www/qos-classify.asp
release/src/router/www/qos-ctrate.asp
release/src/router/www/qos-detailed.asp
release/src/router/www/qos-graphs.asp
release/src/router/www/qos-settings.asp
* origin/QOS-DEV:
fix outgoing QOS prios
allow incoming UDP to be exempted from QOS ingress
Add IMQ based QOS ingress, incoming bandwidth pie chart
Allow user-defined QOS class names
allow up to 80 QOS rules
QoS/Transfer Rates page fixed for K24 builds + improvements for K26 builds
QoS Details/Transfer rates: filters and general improvements
Conflicts:
release/src/router/nvram/defaults.c
release/src/router/www/interfaces.js
release/src/router/www/qos-classify.asp
release/src/router/www/qos-ctrate.asp
release/src/router/www/qos-detailed.asp
release/src/router/www/qos-graphs.asp
release/src/router/www/qos-settings.asp
