diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-26 20:33:58 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-26 20:34:46 +0200 |
| commit | 1b383bf912b25029fb180cf2cf8f33f90d6cf97f (patch) | |
| tree | e5936f5275d180dfca9c810005f99a2b3b0c098f /net/ipv4 | |
| parent | netfilter: ip6t_REJECT: added missing icmpv6 codes (diff) | |
| parent | ipvs: add more mcast parameters for the sync daemon (diff) | |
| download | linux-1b383bf912b25029fb180cf2cf8f33f90d6cf97f.tar.xz linux-1b383bf912b25029fb180cf2cf8f33f90d6cf97f.zip | |
Merge tag 'ipvs2-for-v4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
Simon Horman says:
====================
Second Round of IPVS Updates for v4.3
I realise these are a little late in the cycle, so if you would prefer
me to repost them for v4.4 then just let me know.
The updates include:
* A new scheduler from Raducu Deaconu
* Enhanced configurability of the sync daemon from Julian Anastasov
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions