diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-19 17:07:29 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-19 17:07:29 +0100 |
| commit | e3d39b0e5f880a579fdb03ff6d21543795dd87e0 (patch) | |
| tree | 6be3412f33cd752021712efbcc8ae0f53d5c7be6 /doc/reference | |
| parent | 57c99a690cfd13d05673ed55a5d70168a0235974 (diff) | |
| parent | de62e33618211fd754ad6e372ac93805cce58770 (diff) | |
[MERGE] forward port branch 10.0 up to de62e336182
Diffstat (limited to 'doc/reference')
| -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> |