Merge lp://staging/~openerp-dev/openobject-server/6.1-multicorn-al into lp://staging/openobject-server/6.1
Proposed by
Antony Lesuisse (OpenERP)
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~openerp-dev/openobject-server/6.1-multicorn-al |
Merge into: | lp://staging/openobject-server/6.1 |
Diff against target: |
1101 lines (+486/-397) 10 files modified
gunicorn.conf.py (+0/-62) openerp-cron-worker (+0/-111) openerp-server (+10/-16) openerp-wsgi.py (+53/-0) openerp/__init__.py (+1/-1) openerp/addons/base/ir/ir_cron.py (+0/-56) openerp/service/__init__.py (+30/-9) openerp/tools/config.py (+25/-22) openerp/wsgi/core.py (+367/-86) openerp/wsgi/proxied.py (+0/-34) |
To merge this branch: | bzr merge lp://staging/~openerp-dev/openobject-server/6.1-multicorn-al |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christophe Simonis (OpenERP) | Needs Resubmitting | ||
OpenERP Core Team | Pending | ||
Review via email: mp+109544@code.staging.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 4220. By Antony Lesuisse (OpenERP)
-
[DOC] high_availability
- 4219. By Antony Lesuisse (OpenERP)
-
cron start_internal
- 4218. By Antony Lesuisse (OpenERP)
-
clean shutdown
- 4217. By Antony Lesuisse (OpenERP)
-
wsgi entry point for uwsgi mod_wsgi and gunicorn
- 4216. By Antony Lesuisse (OpenERP)
-
remove proxymode in favour of auto detection
- 4215. By Antony Lesuisse (OpenERP)
-
rename option to workers, application and loading cleanups
- 4214. By Antony Lesuisse (OpenERP)
-
start_multi cleanup
- 4213. By Antony Lesuisse (OpenERP)
-
unicron process cron every 60s
- 4212. By Antony Lesuisse (OpenERP)
-
unicron process cron, remove awful ir_cron._run method
- 4211. By Antony Lesuisse (OpenERP)
-
unicron list databases cleanly
Not for 6.1