diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-20 11:08:54 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-20 11:08:54 +0100 |
| commit | 98d01e46e5ad566f3f36e3c71559daa74692bdc4 (patch) | |
| tree | a35cda603b0a44c3106011d49e179a4eb6662b37 /doc/reference | |
| parent | 77fa9220d39e5e575748b30c66be9f1027732e04 (diff) | |
| parent | 482370d014f409417e8b771beaf2c482a16bffbf (diff) | |
[MERGE] forward port branch saas-15 up to 482370d014f
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> |