Merge lp:~stefan-opener/therp-backports/6.1-bug-905257-fix-reconnect into lp:therp-backports/server-6.1
Proposed by
Stefan Rijnhart (Opener)
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 4297 | ||||
Proposed branch: | lp:~stefan-opener/therp-backports/6.1-bug-905257-fix-reconnect | ||||
Merge into: | lp:therp-backports/server-6.1 | ||||
Diff against target: |
43 lines (+11/-3) 2 files modified
openerp/sql_db.py (+10/-2) setup.py (+1/-1) |
||||
To merge this branch: | bzr merge lp:~stefan-opener/therp-backports/6.1-bug-905257-fix-reconnect | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Holger Brunn (Therp) | Pending | ||
Review via email: mp+148115@code.launchpad.net |
Description of the change
This branch is now a verbatim backport of lp:openobject-addons/7.0 -r 4838..4840
To post a comment you must log in.
Setting to 'work in progress' as a simpler patch has been posted here: https:/ /code.launchpad .net/~openerp- dev/openobject- server/ 7.0-rstcnx- chs