| commit | 1b383bf912b25029fb180cf2cf8f33f90d6cf97f | [log] [tgz] |
|---|---|---|
| author | Pablo Neira Ayuso <pablo@netfilter.org> | Wed Aug 26 20:33:58 2015 +0200 |
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | Wed Aug 26 20:34:46 2015 +0200 |
| tree | e5936f5275d180dfca9c810005f99a2b3b0c098f | |
| parent | 1afe839e6b31a85fc53adbf8757d6373908d414d [diff] | |
| parent | d33288172e72c4729e8b9f2243fb40601afabc8f [diff] |
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>