diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-09-26 19:37:29 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-09-26 19:37:29 +0200 |
| commit | 5f08d82bcd7fa0eaed7c0b0f35c7221c5e0b657a (patch) | |
| tree | 1d1be253f568f18ffd0f7b2bd67577b77afaa3bd /doc | |
| parent | 7b13888c8e258a05a8044b7566b949071a911eab (diff) | |
| parent | fd122aec52166a2d19fe80579dbf9c98c6ab41fa (diff) | |
[MERGE] forward port branch 11.0 up to fd122aec521
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/corporate/dreambits.md | 16 | ||||
| -rw-r--r-- | doc/reference/cmdline.rst | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/doc/cla/corporate/dreambits.md b/doc/cla/corporate/dreambits.md new file mode 100644 index 00000000000..d1dd942436c --- /dev/null +++ b/doc/cla/corporate/dreambits.md @@ -0,0 +1,16 @@ +India, 2018-09-18 + +Dreambits Technologies Pvt. Ltd. agrees to the terms of the Odoo Corporate Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Karan Shah admin@dreambits.in https://github.com/karan-dreambits + +List of contributors: + +Karan Shah admin@dreambits.in https://github.com/karan-dreambits +Devang Pipaliya devang@dreambits.in https://github.com/devang-dreambits diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst index c239262e377..1a7a81e0b93 100644 --- a/doc/reference/cmdline.rst +++ b/doc/reference/cmdline.rst @@ -56,7 +56,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 2048MB. + Defaults to 2048MiB. .. option:: --limit-memory-hard <limit> @@ -64,7 +64,7 @@ Running the server immediately killed without waiting for the end of the current request processing. - Defaults to 2560MB. + Defaults to 2560MiB. .. option:: --limit-time-cpu <limit> |