diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 14:05:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 14:05:59 -0400 |
| commit | 0f8b1a0204a12441cddbbf5be31e6338e0b8da1c (patch) | |
| tree | 7a546266d24908269049bde5cb40aade4b45b06a /Documentation | |
| parent | 928c0c1571b004917a989c4d92b09ac129ad68b2 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
Merge v3.9-rc5 into driver-core-next
We want the fixes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/ipvs-sysctl.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt index f2a2488f1bf3..9573d0c48c6e 100644 --- a/Documentation/networking/ipvs-sysctl.txt +++ b/Documentation/networking/ipvs-sysctl.txt | |||
| @@ -15,6 +15,13 @@ amemthresh - INTEGER | |||
| 15 | enabled and the variable is automatically set to 2, otherwise | 15 | enabled and the variable is automatically set to 2, otherwise |
| 16 | the strategy is disabled and the variable is set to 1. | 16 | the strategy is disabled and the variable is set to 1. |
| 17 | 17 | ||
| 18 | backup_only - BOOLEAN | ||
| 19 | 0 - disabled (default) | ||
| 20 | not 0 - enabled | ||
| 21 | |||
| 22 | If set, disable the director function while the server is | ||
| 23 | in backup mode to avoid packet loops for DR/TUN methods. | ||
| 24 | |||
| 18 | conntrack - BOOLEAN | 25 | conntrack - BOOLEAN |
| 19 | 0 - disabled (default) | 26 | 0 - disabled (default) |
| 20 | not 0 - enabled | 27 | not 0 - enabled |