[MERGE] forward port branch saas-6 up to 63944d30ba

addons/google_drive/google_drive.py

@@ -142,7 +142,7 @@ class config(osv.Model):
         # check if a model is configured with a template
         config_ids = self.search(cr, uid, [('model_id', '=', res_model)], context=context)
         configs = []
-        for config in self.browse(cr, uid, config_ids, context=context):
+        for config in self.browse(cr, SUPERUSER_ID, config_ids, context=context):
             if config.filter_id:
                 if (config.filter_id.user_id and config.filter_id.user_id.id != uid):
                     #Private

doc/cla/corporate/merchise.md

@@ -0,0 +1,19 @@
+Cuba, 2017-07-03
+
+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.
+
+Signed,
+
+Manuel Vázquez manuel@merchise.org https://github.com/mvaled
+
+
+List of contributors:
+
+Manuel Vázquez manuel@merchise.org https://github.com/mvaled
+Johanny johanny@merchise.org
+Henrik Pestano henrik@merchise.org https://github.com/hpestano
+Oraldo oraldo@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
 

openerp/service/server.py

@@ -732,7 +732,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