diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-19 13:25:05 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-19 13:25:05 +0100 |
| commit | da881b0bd2f8f672cd470f6481542bd96896f410 (patch) | |
| tree | d8e668f0a110ae9b4e6ff71125e1ecd6a7fdc79f /doc | |
| parent | fc55d649d69a4b1084cb7b4acc3c93f461517589 (diff) | |
| parent | 5d086cea9b97cec4fe8d07bf6cb06b3d7ee28af7 (diff) | |
[MERGE] forward port branch 9.0 up to 5d086cea9b9
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/cmdline.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst index b8881e9a935..6e08973d60e 100644 --- a/doc/reference/cmdline.rst +++ b/doc/reference/cmdline.rst @@ -54,7 +54,7 @@ Running the server Maximum allowed virtual memory per worker. If the limit is exceeded, the worker is killed and recycled at the end of the current request. - Defaults to 640MB. + Defaults to 2048MB. .. option:: --limit-memory-hard <limit> @@ -62,7 +62,7 @@ Running the server immediately killed without waiting for the end of the current request processing. - Defaults to 768MB. + Defaults to 2560MB. .. option:: --limit-time-cpu <limit> |