[MERGE] diagram view label

[odoo/odoo.git] / openerp / __init__.py

diff --git a/openerp/__init__.py b/openerp/__init__.py
index cc35566..7e723c4 100644 (file)
--- a/openerp/__init__.py
+++ b/openerp/__init__.py
@@ -27,7 +27,6 @@ SUPERUSER_ID = 1
 
 import addons
 import conf
-import cron
 import loglevels
 import modules
 import netsvc
@@ -46,12 +45,5 @@ import wizard
 import workflow
 import wsgi
 
-# Is the server running in multi-process mode (e.g. behind Gunicorn).
-# If this is True, the processes have to communicate some events,
-# e.g. database update or cache invalidation. Each process has also
-# its own copy of the data structure and we don't need to care about
-# locks between threads.
-multi_process = False
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: