diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-01 16:01:54 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-01 16:01:54 +0200 |
| commit | 43b63a04656276926dfecd65d3058d6464ee8ac5 (patch) | |
| tree | d0f7c5b4a66540fa8422de2be928a30167e45eed /doc | |
| parent | b2870ae1ebc4d198c69142a2399827848d7d30b4 (diff) | |
| parent | 57e387b645200756c29423af463afe001707f2ac (diff) | |
[MERGE] forward port branch saas-11.4 up to 57e387b6452
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/corporate/dreambits.md | 16 | ||||
| -rw-r--r-- | doc/cla/corporate/inspur.md | 17 | ||||
| -rw-r--r-- | doc/reference/cmdline.rst | 4 |
3 files changed, 35 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/cla/corporate/inspur.md b/doc/cla/corporate/inspur.md new file mode 100644 index 00000000000..88999bdf10b --- /dev/null +++ b/doc/cla/corporate/inspur.md @@ -0,0 +1,17 @@ +China, 2018-09-28 + +Inspur Genersoft Co., 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, + +David Yu, yudw@inspur.com + +List of contributors: + +Brain Wang wangbuke@inspur.com +David Yu yudw@inspur.com +Alex Aisin-Gioro wubai@inspur.com diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst index 18c1efb4656..83df644f150 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> |