Merge lp:~logan/ubuntu/raring/couchdb/1.2.0-5 into lp:ubuntu/raring/couchdb
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merge reported by: | Jamie Strandboge |
Merged at revision: | not available |
Proposed branch: | lp:~logan/ubuntu/raring/couchdb/1.2.0-5 |
Merge into: | lp:ubuntu/raring/couchdb |
Diff against target: |
219 lines (+130/-8) 9 files modified
.pc/applied-patches (+3/-0) debian/changelog (+25/-0) debian/patches/improve_parsing_of_mochiweb_relative_paths.patch (+40/-0) debian/patches/improve_script_url_validation.patch (+26/-0) debian/patches/include_a_comment_before_jsonp_output.patch (+20/-0) debian/patches/series (+3/-0) share/www/script/couch_test_runner.js (+3/-5) src/couchdb/couch_httpd.erl (+1/-1) src/mochiweb/mochiweb_util.erl (+9/-2) |
To merge this branch: | bzr merge lp:~logan/ubuntu/raring/couchdb/1.2.0-5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jamie Strandboge | Approve | ||
Ubuntu branches | Pending | ||
Review via email:
|
To post a comment you must log in.
Thanks for your merge! ACK, though in the future you might also file a security bug and subscribe ubuntu- security- sponsors so a member of the security team could review it. Thanks again.