[MERGE] forward port branch saas-11 up to 5f7f3209e0

addons/google_drive/models/google_drive.py

@@ -160,7 +160,7 @@ class GoogleDrive(models.Model):
         # check if a model is configured with a template
         configs = self.search([('model_id', '=', res_model)])
         config_values = []
-        for config in configs:
+        for config in configs.sudo():
             if config.filter_id:
                 if config.filter_id.user_id and config.filter_id.user_id.id != self.env.user.id:
                     #Private

doc/cla/corporate/merchise.md

@@ -1,8 +1,7 @@
-Havana, 2017-05-05
+Cuba, 2017-07-03
 
-Merchise Autrement (https://github.com/merchise/ and
-https://github.com/merchise-autrement/) agrees to the terms of the Odoo
-Corporate Contributor License Agreement v1.0.
+Merchise Autrement [~º/~] 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.
@@ -11,7 +10,7 @@ Signed,
 
 Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled
 
-List of contributors (some members don't have a github account yet):
+List of contributors:
 
 Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled
 Johanny Rivera johanny@merchise.org

doc/cla/corporate/therp.md

@@ -1,6 +1,8 @@
 Netherlands, 2015-03-09
 
-Updated 2016-05-27
+Updated:
+    2016-05-27
+    2017-06-27
 
 Therp BV agrees to the terms of the Odoo Corporate 
 Contributor License Agreement v1.0.
@@ -18,4 +20,5 @@ List of contributors:
 *  Holger Brunn hbrunn@therp.nl https://github.com/hbrunn
 *  Lara Freeke lfreeke@therp.nl https://github.com/lfreeke
 *  Ronald Portier ronald@therp.nl https://github.com/nl66278
+*  George Daramouskas gdaramouskas@therp.nl https://github.com/daramousk
 

odoo/service/server.py

@@ -748,7 +748,7 @@ class WorkerHTTP(Worker):
     """ HTTP Request workers """
     def process_request(self, client, addr):
         client.setblocking(1)
-        client.settimeout(0.5)
+        client.settimeout(2)
         client.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         # Prevent fd inherientence close_on_exec
         flags = fcntl.fcntl(client, fcntl.F_GETFD) | fcntl.FD_CLOEXEC