Merge lp:~taktik/openobject-server/trunk-bugfix-1182778 into lp:openobject-server/6.1

Proposed by David Lefever @ Taktik
Status: Merged
Merged at revision: 4351
Proposed branch: lp:~taktik/openobject-server/trunk-bugfix-1182778
Merge into: lp:openobject-server/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/addons/base/ir/ir_cron.py (+1/-1)
To merge this branch: bzr merge lp:~taktik/openobject-server/trunk-bugfix-1182778
Reviewer Review Type Date Requested Status
Martin Trigaux (OpenERP) (community) Approve
Review via email: mp+165026@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

The changes have been integrated into openerp 6.1 server at revision 4351 (revision-id: <email address hidden>).
Thanks for the patch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/ir/ir_cron.py'
2--- openerp/addons/base/ir/ir_cron.py 2013-01-31 09:21:45 +0000
3+++ openerp/addons/base/ir/ir_cron.py 2013-05-22 08:04:26 +0000
4@@ -409,7 +409,7 @@
5 class W(object):
6 alive = True
7 worker = W()
8- openerp.wsgi.core.post_request(worker, 'dummy', 'dummy')
9+ openerp.wsgi.core.post_request(worker, 'dummy')
10 if not worker.alive:
11 return
12 if not acquired: