Odoo Server (MOVED TO GITHUB)

Merge lp:~camptocamp/openobject-server/7.0-fix_1305872-afe into lp:openobject-server/7.0

  1. 7.0-fix_1305872-afe
  2. Merge into 7.0
Proposed by Alexandre Fayolle - camptocamp
Status: Merged
Merged at revision: 5280
Proposed branch: lp:~camptocamp/openobject-server/7.0-fix_1305872-afe
Merge into: lp:openobject-server/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
setup.py (+1/-1)
To merge this branch: bzr merge lp:~camptocamp/openobject-server/7.0-fix_1305872-afe
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+215175@code.launchpad.net

Description of the change

allow using pywebdav 0.9.4.1

To post a comment you must log in.
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Thanks for the patch! However if it comes to relaxing the rule I'd rather make it < 0.9.8 so we allow future security patches while still avoiding the API change of 0.9.8. I've merged that change at revision 5280.
Let's mark your MP as merged because it's as good as merged ;-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2014-04-09 08:13:49 +0000
3+++ setup.py 2014-04-10 13:20:54 +0000
4@@ -131,7 +131,7 @@
5 'python-ldap', # optional
6 'python-openid',
7 'pytz',
8- 'pywebdav <= 0.9.4',
9+ 'pywebdav <= 0.9.4.1',
10 'pyyaml',
11 'reportlab', # windows binary pypi.python.org/pypi/reportlab
12 'simplejson',