lp://staging/~credativ/openobject-server/7.0-fixes-syslog
Created by
mistotebe
and last modified
- Get this branch:
- bzr branch lp://staging/~credativ/openobject-server/7.0-fixes-syslog
Branch merges
Propose for merging
No branches
dependent on this one.
Superseded
for merging
into
lp://staging/openobject-server
- OpenERP Core Team: Pending requested
-
Diff: 54 lines (+17/-2)2 files modifiedopenerp/netsvc.py (+1/-1)
openerp/tools/config.py (+16/-1)
Rejected
for merging
into
lp://staging/openobject-server/7.0
- OpenERP Core Team: Pending requested
-
Diff: 196839 lines (+134996/-27844) (has conflicts)229 files modifiedMANIFEST.in (+1/-1)
debian/control (+2/-2)
debian/openerp.postrm (+2/-1)
doc/01_getting_started.rst (+0/-3)
doc/02_architecture.rst (+45/-2)
doc/03_module_dev.rst (+1/-0)
doc/adding-command.rst (+34/-0)
doc/changelog.rst (+23/-0)
doc/commands.rst (+40/-0)
doc/conf.py (+0/-1)
doc/deployment-gunicorn.rst (+11/-40)
doc/deployment-mod-wsgi.rst (+73/-0)
doc/form-view-guidelines.rst (+303/-0)
doc/index.rst (+23/-2)
doc/openerp-command.rst (+66/-0)
doc/orm-methods.rst (+61/-0)
doc/report-declaration.rst (+23/-0)
doc/routing.rst (+29/-0)
install/openerp-server.1 (+0/-11)
oe (+5/-0)
oe-bash-completion (+89/-0)
openerp/.apidoc (+0/-1)
openerp/PKG-INFO (+1/-1)
openerp/__init__.py (+13/-3)
openerp/addons/base/i18n/ab.po (+19/-129)
openerp/addons/base/i18n/af.po (+67/-132)
openerp/addons/base/i18n/am.po (+21/-131)
openerp/addons/base/i18n/ar.po (+1365/-136)
openerp/addons/base/i18n/base.pot (+154/-287)
openerp/addons/base/i18n/bg.po (+1216/-137)
openerp/addons/base/i18n/bs.po (+132/-137)
openerp/addons/base/i18n/ca.po (+1708/-137)
openerp/addons/base/i18n/cs.po (+2074/-145)
openerp/addons/base/i18n/da.po (+220/-135)
openerp/addons/base/i18n/de.po (+6951/-147)
openerp/addons/base/i18n/el.po (+1172/-137)
openerp/addons/base/i18n/en_GB.po (+3245/-132)
openerp/addons/base/i18n/es.po (+5581/-128)
openerp/addons/base/i18n/es_AR.po (+739/-129)
openerp/addons/base/i18n/es_CL.po (+1748/-137)
openerp/addons/base/i18n/es_CR.po (+8032/-121)
openerp/addons/base/i18n/es_DO.po (+103/-136)
openerp/addons/base/i18n/es_EC.po (+2647/-141)
openerp/addons/base/i18n/es_MX.po (+34/-130)
openerp/addons/base/i18n/es_VE.po (+23/-130)
openerp/addons/base/i18n/et.po (+786/-141)
openerp/addons/base/i18n/eu.po (+25/-132)
openerp/addons/base/i18n/fa.po (+846/-138)
openerp/addons/base/i18n/fa_AF.po (+21/-131)
openerp/addons/base/i18n/fi.po (+1989/-137)
openerp/addons/base/i18n/fr.po (+5716/-114)
openerp/addons/base/i18n/fr_CA.po (+0/-15423)
openerp/addons/base/i18n/gl.po (+1839/-161)
openerp/addons/base/i18n/gu.po (+382/-130)
openerp/addons/base/i18n/he.po (+627/-135)
openerp/addons/base/i18n/hi.po (+20/-130)
openerp/addons/base/i18n/hr.po (+1658/-144)
openerp/addons/base/i18n/hu.po (+3461/-145)
openerp/addons/base/i18n/hy.po (+412/-138)
openerp/addons/base/i18n/id.po (+73/-125)
openerp/addons/base/i18n/is.po (+312/-135)
openerp/addons/base/i18n/it.po (+1795/-144)
openerp/addons/base/i18n/ja.po (+7087/-132)
openerp/addons/base/i18n/ka.po (+4482/-130)
openerp/addons/base/i18n/kk.po (+217/-131)
openerp/addons/base/i18n/ko.po (+2572/-132)
openerp/addons/base/i18n/lt.po (+398/-129)
openerp/addons/base/i18n/lv.po (+1077/-135)
openerp/addons/base/i18n/mk.po (+199/-143)
openerp/addons/base/i18n/mn.po (+6818/-145)
openerp/addons/base/i18n/nb.po (+965/-132)
openerp/addons/base/i18n/nl.po (+3069/-144)
openerp/addons/base/i18n/nl_BE.po (+79/-131)
openerp/addons/base/i18n/pl.po (+1489/-131)
openerp/addons/base/i18n/pt.po (+2562/-144)
openerp/addons/base/i18n/pt_BR.po (+4391/-145)
openerp/addons/base/i18n/ro.po (+8563/-136)
openerp/addons/base/i18n/ru.po (+7736/-136)
openerp/addons/base/i18n/sk.po (+1422/-135)
openerp/addons/base/i18n/sl.po (+1727/-137)
openerp/addons/base/i18n/sq.po (+30/-137)
openerp/addons/base/i18n/sr.po (+1290/-135)
openerp/addons/base/i18n/sr@latin.po (+4603/-134)
openerp/addons/base/i18n/sv.po (+2885/-137)
openerp/addons/base/i18n/th.po (+28/-135)
openerp/addons/base/i18n/tlh.po (+26/-137)
openerp/addons/base/i18n/tr.po (+2157/-136)
openerp/addons/base/i18n/uk.po (+697/-137)
openerp/addons/base/i18n/ur.po (+21/-131)
openerp/addons/base/i18n/vi.po (+640/-136)
openerp/addons/base/i18n/zh_CN.po (+4553/-144)
openerp/addons/base/i18n/zh_HK.po (+82/-132)
openerp/addons/base/i18n/zh_TW.po (+997/-144)
openerp/addons/base/ir/ir_actions.py (+91/-39)
openerp/addons/base/ir/ir_actions.xml (+1/-0)
openerp/addons/base/ir/ir_attachment.py (+4/-4)
openerp/addons/base/ir/ir_cron.py (+25/-18)
openerp/addons/base/ir/ir_mail_server.py (+3/-1)
openerp/addons/base/ir/ir_model.py (+69/-52)
openerp/addons/base/ir/ir_rule.py (+3/-3)
openerp/addons/base/ir/ir_translation.py (+44/-5)
openerp/addons/base/ir/ir_translation_view.xml (+3/-3)
openerp/addons/base/ir/ir_ui_menu.py (+13/-11)
openerp/addons/base/ir/ir_ui_view.py (+5/-5)
openerp/addons/base/ir/ir_values.py (+2/-2)
openerp/addons/base/ir/workflow/workflow.py (+3/-5)
openerp/addons/base/module/module.py (+5/-4)
openerp/addons/base/module/report/ir_module_reference_print.py (+8/-8)
openerp/addons/base/module/wizard/base_module_scan.py (+0/-74)
openerp/addons/base/module/wizard/base_module_upgrade.py (+2/-2)
openerp/addons/base/res/ir_property.py (+3/-2)
openerp/addons/base/res/res_company.py (+9/-3)
openerp/addons/base/res/res_company_view.xml (+1/-1)
openerp/addons/base/res/res_config.py (+91/-9)
openerp/addons/base/res/res_country.py (+1/-1)
openerp/addons/base/res/res_currency.py (+4/-0)
openerp/addons/base/res/res_lang.py (+0/-87)
openerp/addons/base/res/res_partner.py (+28/-15)
openerp/addons/base/res/res_partner_view.xml (+7/-6)
openerp/addons/base/res/res_users.py (+32/-16)
openerp/addons/base/res/res_users_view.xml (+44/-49)
openerp/addons/base/rng/view.rng (+1/-0)
openerp/addons/base/test/__init__.py (+0/-27)
openerp/addons/base/test/base_test.yml (+8/-8)
openerp/addons/base/test/test_auth.yml (+2/-2)
openerp/addons/base/tests/__init__.py (+4/-0)
openerp/addons/base/tests/test_res_config.py (+80/-0)
openerp/addons/base/tests/test_res_lang.py (+41/-12)
openerp/cli/server.py (+25/-11)
openerp/conf/deprecation.py (+25/-1)
openerp/exceptions.py (+11/-0)
openerp/http.py (+37/-0)
openerp/import_xml.rng (+6/-12)
openerp/loglevels.py (+0/-66)
openerp/modules/graph.py (+0/-3)
openerp/modules/loading.py (+24/-35)
openerp/modules/migration.py (+18/-35)
openerp/modules/module.py (+5/-63)
openerp/modules/registry.py (+24/-11)
openerp/netsvc.py (+71/-124)
openerp/osv/__init__.py (+0/-1)
openerp/osv/expression.py (+2/-3)
openerp/osv/fields.py (+24/-23)
openerp/osv/orm.py (+176/-128)
openerp/osv/osv.py (+7/-213)
openerp/osv/query.py (+0/-1)
openerp/pooler.py (+9/-0)
openerp/release.py (+1/-1)
openerp/report/__init__.py (+9/-1)
openerp/report/custom.py (+14/-14)
openerp/report/interface.py (+26/-15)
openerp/report/print_xml.py (+6/-6)
openerp/report/printscreen/__init__.py (+0/-1)
openerp/report/printscreen/ps_form.py (+3/-4)
openerp/report/printscreen/ps_list.py (+8/-8)
openerp/report/pyPdf/__init__.py (+0/-1)
openerp/report/render/__init__.py (+0/-1)
openerp/report/render/html2html/__init__.py (+0/-1)
openerp/report/render/makohtml2html/__init__.py (+0/-1)
openerp/report/render/odt2odt/__init__.py (+0/-1)
openerp/report/render/rml2html/__init__.py (+0/-1)
openerp/report/render/rml2pdf/__init__.py (+0/-1)
openerp/report/render/rml2pdf/customfonts.py (+0/-1)
openerp/report/render/rml2pdf/utils.py (+5/-8)
openerp/report/render/rml2txt/__init__.py (+0/-1)
openerp/report/report_sxw.py (+29/-17)
openerp/service/__init__.py (+11/-15)
openerp/service/common.py (+69/-0)
openerp/service/cron.py (+1/-5)
openerp/service/db.py (+365/-0)
openerp/service/http_server.py (+0/-1)
openerp/service/model.py (+202/-0)
openerp/service/netrpc_server.py (+0/-245)
openerp/service/netrpc_socket.py (+0/-99)
openerp/service/report.py (+146/-0)
openerp/service/security.py (+6/-12)
openerp/service/web_services.py (+0/-774)
openerp/service/websrv_lib.py (+0/-1)
openerp/service/workers.py (+44/-3)
openerp/service/wsgi_server.py (+53/-22)
openerp/sql_db.py (+0/-5)
openerp/tests/__init__.py (+2/-0)
openerp/tests/addons/test_exceptions/models.py (+36/-1)
openerp/tests/addons/test_exceptions/view.xml (+44/-2)
openerp/tests/addons/test_impex/tests/test_load.py (+2/-6)
openerp/tests/common.py (+1/-0)
openerp/tests/test_uninstall.py (+4/-4)
openerp/tests/test_xmlrpc.py (+8/-0)
openerp/tools/__init__.py (+0/-1)
openerp/tools/config.py (+27/-22)
openerp/tools/convert.py (+57/-63)
openerp/tools/image.py (+9/-7)
openerp/tools/mail.py (+9/-11)
openerp/tools/misc.py (+0/-16)
openerp/tools/parse_version.py (+1/-1)
openerp/tools/safe_eval.py (+25/-9)
openerp/tools/test_reports.py (+15/-13)
openerp/tools/translate.py (+24/-67)
openerp/tools/yaml_import.py (+34/-31)
openerp/workflow/__init__.py (+118/-5)
openerp/workflow/common.py (+0/-28)
openerp/workflow/wkf_expr.py (+5/-5)
openerp/workflow/wkf_logs.py (+0/-39)
openerp/workflow/wkf_service.py (+0/-156)
openerp/workflow/workitem.py (+14/-18)
openerpcommand/__init__.py (+63/-0)
openerpcommand/addons/bench_sale_mrp/__init__.py (+3/-0)
openerpcommand/addons/bench_sale_mrp/__openerp__.py (+15/-0)
openerpcommand/addons/bench_sale_mrp/data.yml (+41/-0)
openerpcommand/bench_sale_mrp.py (+68/-0)
openerpcommand/benchmarks.py (+166/-0)
openerpcommand/call.py (+44/-0)
openerpcommand/client.py (+137/-0)
openerpcommand/common.py (+109/-0)
openerpcommand/conf.py (+25/-0)
openerpcommand/cron.py (+46/-0)
openerpcommand/drop.py (+50/-0)
openerpcommand/initialize.py (+116/-0)
openerpcommand/main.py (+7/-0)
openerpcommand/model.py (+61/-0)
openerpcommand/module.py (+68/-0)
openerpcommand/read.py (+64/-0)
openerpcommand/run_tests.py (+201/-0)
openerpcommand/scaffold.py (+77/-0)
openerpcommand/uninstall.py (+66/-0)
openerpcommand/update.py (+19/-0)
openerpcommand/web.py (+93/-0)
scripts/run_all_with_tests.sh (+0/-1)
setup.py (+3/-0)
Branch information
Recent revisions
- 4879. By mistotebe
-
[IMP] Allow syslog facility configuration
When setting up multiple servers on a single machine, or just setting up cron
workers to run in a separate process, one might want to keep the log streams
separate. This has not been possible when logging through syslog. This commit
adds a configuration option to change the syslog facility. - 4875. By Thibault Delavallée (OpenERP)
-
[MERGE] [FORWARD] Forward-port of saas-1 branch until revision 4875
Revision ID: <email address hidden>
- 4873. By Raphael Collet (OpenERP)
-
[FIX] res_config tests: isinstance(x, long) is False when x is an int!
- 4870. By Vo Minh Thu
-
[FIX] long-polling: use start()/stop() instead of serve_forever().
This is done so detecting a possible PPID change works.
(So that the worker dies when its parent dies.)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/openobject-server