diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-20 11:53:06 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-20 11:53:06 +0100 |
| commit | bd16df15ea6ce7d746e09a48909391c768694396 (patch) | |
| tree | 9c884d21454a109e190eb5d86292bb4851a0d1d8 /doc/reference | |
| parent | 09323cc4701278410a3d527a7c9540102c7f3cc4 (diff) | |
| parent | 98d01e46e5ad566f3f36e3c71559daa74692bdc4 (diff) | |
[MERGE] forward port branch saas-16 up to 98d01e46e5a
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 d35868a718f..2f1626f6dac 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> |