Merge branch 'Teaman-ND' into Teaman-ND-SDHCTeaman-ND-1.28.0007-SDHC
commitc491fd9098043d40f84f903a6c8b77f19d4fd3ea
authorAugusto Bott <augusto@bott.com.br>
Tue, 13 Sep 2011 09:05:13 +0000 (13 06:05 -0300)
committerAugusto Bott <augusto@bott.com.br>
Tue, 13 Sep 2011 09:05:13 +0000 (13 06:05 -0300)
treecbd67512077ecb9146f0fb88e57ef5447281bbe7
parent3e313399a2e1a9ed3bccf157873da0d72440f6ba
parent759b6e20e8254d012216d8f7876f8c5e0052bdfa
Merge branch 'Teaman-ND' into Teaman-ND-SDHC

* Teaman-ND:
  Bugfix: same as previous commit for cstats
  Option to include (or not) SNMP
  Bugfix: tx/rx info fixed on IP Traffic Transfer Rates page
  IP Traffic visual enhancements
  Static ARP binding
  IPTraffic history is now kept only for configured addresses
  IPTraffic history is now kept only for configured addresses
  IPTraffic history is now kept only for configured addresses
  Fixes "Ignore DHCP requests from unknown devices"
  Latest updates from Teaman-IPTraffic
  cstats fixes, improvements on IP Traffic and QoS pages
  QoS cosmetics (details/ctrates filters)
  Experimental/alternative IP Traffic monitor
  Experimental/alternative IP Traffic monitor
  SNMP integration and GUI (from tomato-shibby)
  Proper calculation of DHCP ranges for a subnet (first/last IP available, broadcast, subnet on IPv4)

Conflicts:
release/src/Makefile
release/src/router/Makefile
release/src/router/config_base
release/src/router/www/about.asp
release/src/Makefile
release/src/router/Makefile
release/src/router/httpd/tomato.c
release/src/router/httpd/tomato.h
release/src/router/nvram/defaults.c
release/src/router/rc/Makefile
release/src/router/rc/rc.h
release/src/router/rc/services.c
release/src/router/www/about.asp
release/src/router/www/tomato.js