projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f4a296e) | patch
manual merge of multicorn
authorAntony Lesuisse <al@openerp.com>
Sat, 22 Sep 2012 10:51:07 +0000 (12:51 +0200)
committerAntony Lesuisse <al@openerp.com>
Sat, 22 Sep 2012 10:51:07 +0000 (12:51 +0200)
commit4679680dba42a4071c8fbbc43a33e2e61bdb812e
tree27149f115fd94d508a394d673b447f96cff21206tree | snapshot
parentf4a296e0289952f939d39b4b9836ca45dff9d247commit | diff
manual merge of multicorn

bzr revid: al@openerp.com-20120922105107-q02ogtsfudphzkl6
16 files changed:
gunicorn.conf.py [deleted file] blob | history
openerp-server diff | blob | history
openerp-wsgi.py [new file with mode: 0644] blob
openerp/__init__.py diff | blob | history
openerp/addons/base/ir/ir_cron.py diff | blob | history
openerp/db/__init__.py [deleted file] blob | history
openerp/service/__init__.py diff | blob | history
openerp/service/netrpc_server.py diff | blob | history
openerp/service/netrpc_socket.py [new file with mode: 0644] blob
openerp/service/workers.py [new file with mode: 0644] blob
openerp/service/wsgi_server.py [new file with mode: 0644] blob
openerp/tiny_socket.py [deleted file] blob | history
openerp/tools/config.py diff | blob | history
openerp/wsgi/__init__.py [deleted file] blob | history
openerp/wsgi/core.py [deleted file] blob | history
openerp/wsgi/proxied.py [deleted file] blob | history
Unnamed repository; edit this file 'description' to name the repository.