Merge lp:~shineit/openobject-server/fix-data-dir-setting-ignored into lp:openobject-server

Proposed by digitalsatori(Shine IT)
Status: Needs review
Proposed branch: lp:~shineit/openobject-server/fix-data-dir-setting-ignored
Merge into: lp:openobject-server
Diff against target: 11 lines (+0/-1)
1 file modified
openerp/__init__.py (+0/-1)
To merge this branch: bzr merge lp:~shineit/openobject-server/fix-data-dir-setting-ignored
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+217559@code.launchpad.net

Description of the change

loading http module too early cause the dir-data setting is ignored for sesion path.

To post a comment you must log in.

Unmerged revisions

5197. By Tony Gu <email address hidden>

http module loaded too early, cause data-dir setting ignored

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/__init__.py'
2--- openerp/__init__.py 2014-02-09 15:18:22 +0000
3+++ openerp/__init__.py 2014-04-29 08:00:21 +0000
4@@ -69,7 +69,6 @@
5 import addons
6 import cli
7 import conf
8-import http
9 import loglevels
10 import modules
11 import netsvc