| commit | 9c546aeb9ae9ca59e5c8e12caed8f79a24dc818d | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Tue, 3 Jan 2012 11:14:24 +0000 (3 09:14 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Tue, 3 Jan 2012 11:14:24 +0000 (3 09:14 -0200) | ||
| tree | 765dddea16b0ba8d21c940df77d7494acc991faa | tree |
| parent | 21dc585b02f7c9a44d0cd62fd146aa514d0f84ab | commitdiff |
| parent | 92cde0d886aa579da4d2e7ff981e59574c6c10de | commitdiff |
Merge branch 'Teaman-ND' into Teaman-ND-SDHC
* Teaman-ND:
IPTraffic: get rid of nested loop for realtime conntrack counting
IPTraffic: realtime stats gathering fixes
rc/firewall: reorg ipt_account rules creation
rc/firewall: add "Route Modem IP" iptables NAT rules first
httpd: increased limit for HTTP_MAX_LISTENERS
IPTraffic: K24 ipt_account module updated to v0.1.20
Static ARP: option to enable all known devices
Static ARP: minor fix at service shutdown
* Teaman-ND:
IPTraffic: get rid of nested loop for realtime conntrack counting
IPTraffic: realtime stats gathering fixes
rc/firewall: reorg ipt_account rules creation
rc/firewall: add "Route Modem IP" iptables NAT rules first
httpd: increased limit for HTTP_MAX_LISTENERS
IPTraffic: K24 ipt_account module updated to v0.1.20
Static ARP: option to enable all known devices
Static ARP: minor fix at service shutdown