[MERGE] forward port branch saas-11.1 up to e750bb6e114

7 files changed, 74 insertions, 7 deletions

diff --git a/doc/_extensions/autojsdoc/parser/tests/test_typespec.py b/doc/_extensions/autojsdoc/parser/tests/test_typespec.py
index d90fe7995dd..b2a5a5258b2 100644
--- a/doc/_extensions/autojsdoc/parser/tests/test_typespec.py
+++ b/doc/_extensions/autojsdoc/parser/tests/test_typespec.py
@@ -35,6 +35,16 @@ def test_parser():
             types.Literal('null'),
         ])])
     ])
+    assert types.parse('Function<Array<Object[]>>') == types.Alt([
+        types.Type('Function', [types.Alt([
+            types.Type('Array', [types.Alt([
+                types.Type('Array', [
+                    types.Type('Object', [])
+                ])
+            ])])
+        ])])
+    ])
+
 
 def test_tokens():
     toks = list(types.tokenize('A'))
@@ -64,6 +74,19 @@ def test_tokens():
         (types.OP, '>')
     ]
 
+    toks = list(types.tokenize('Function<Array<Object[]>>'))
+    assert toks == [
+        (types.NAME, 'Function'),
+        (types.OP, '<'),
+        (types.NAME, 'Array'),
+        (types.OP, '<'),
+        (types.NAME, 'Object'),
+        (types.OP, '['),
+        (types.OP, ']'),
+        (types.OP, '>'),
+        (types.OP, '>')
+    ]
+
 def test_peekable():
     p = types.Peekable(range(5))
 
diff --git a/doc/_extensions/autojsdoc/parser/types.py b/doc/_extensions/autojsdoc/parser/types.py
index ecbccfe8651..8737b26ecc9 100644
--- a/doc/_extensions/autojsdoc/parser/types.py
+++ b/doc/_extensions/autojsdoc/parser/types.py
@@ -29,6 +29,9 @@ def tokenize(typespec):
         elif toktype == token.OP:
             if string in '|<>[].,':
                 yield (OP, string)
+            elif string == '>>':
+                yield (OP, '>')
+                yield (OP, '>')
             elif string == '*': # maybe?
                 yield (NAME, 'any')
             elif string in '()':
diff --git a/doc/cla/individual/osarrat.md b/doc/cla/individual/osarrat.md
new file mode 100644
index 00000000000..bc1df33fd79
--- /dev/null
+++ b/doc/cla/individual/osarrat.md
@@ -0,0 +1,11 @@
+France, 2018-02-16
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Olivier Sarrat olivier.sarrat@laposte.net https://github.com/osarrat
diff --git a/doc/cla/individual/subodhdahal.md b/doc/cla/individual/subodhdahal.md
new file mode 100644
index 00000000000..4e4c389bc99
--- /dev/null
+++ b/doc/cla/individual/subodhdahal.md
@@ -0,0 +1,11 @@
+Nepal, 2018-02-09
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Subodh Dahal contact.subodhdahal@gmail.com https://github.com/SubodhDahal
diff --git a/doc/cla/individual/willmakenoise.md b/doc/cla/individual/willmakenoise.md
new file mode 100644
index 00000000000..3c8ac824146
--- /dev/null
+++ b/doc/cla/individual/willmakenoise.md
@@ -0,0 +1,10 @@
+Norway, 2018-02-08
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+Marius Stedjan marius@stedjan.com https://github.com/willmakenoise
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>
 
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst
index b0a5cf3224e..6a1e22f886c 100644
--- a/doc/setup/deploy.rst
+++ b/doc/setup/deploy.rst
@@ -214,6 +214,13 @@ Instead you must have a proxy redirecting requests whose URL starts with
 ``/longpolling/`` to the longpolling port. Other request should be proxied to
 the :option:`normal HTTP port <odoo-bin --http-port>`
 
+To achieve such a thing, you'll need to deploy a reverse proxy in front of Odoo,
+like nginx or apache. When doing so, you'll need to forward some more http Headers
+to Odoo, and activate the proxy_mode in Odoo configuration to have Odoo read those
+headers.
+
+
+
 Configuration sample
 --------------------
 
@@ -316,16 +323,18 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
    # log
    access_log /var/log/nginx/odoo.access.log;
    error_log /var/log/nginx/odoo.error.log;
-   
+
+   # Redirect longpoll requests to odoo longpolling port
+   location /longpolling {
+   proxy_pass http://odoochat;
+   }
+
    # Redirect requests to odoo backend server
    location / {
      proxy_redirect off;
      proxy_pass http://odoo;
    }
-   location /longpolling {
-       proxy_pass http://odoochat;
-   }
- 
+
    # common gzip
    gzip_types text/css text/less text/plain text/xml application/xml application/json application/javascript;
    gzip on;