Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Proposed by
Paul J. Lucas
Status: | Merged |
---|---|
Approved by: | Paul J. Lucas |
Approved revision: | 11399 |
Merged at revision: | 11684 |
Proposed branch: | lp:~paul-lucas/zorba/pjl-misc |
Merge into: | lp:zorba |
Diff against target: |
358 lines (+67/-29) 19 files modified
include/zorba/item.h (+1/-1) include/zorba/util/base64_stream.h (+6/-4) include/zorba/util/hexbinary_stream.h (+4/-1) modules/http-client/json/http-client.xq.src/http_client.cpp (+1/-0) modules/http-client/json/http-client.xq.src/http_request_handler.cpp (+4/-16) modules/http-client/json/http-client.xq.src/http_request_handler.h (+1/-0) modules/http-client/json/http-client.xq.src/http_response_handler.cpp (+1/-0) modules/http-client/json/http-client.xq.src/http_response_handler.h (+1/-0) modules/http-client/json/http-client.xq.src/http_response_parser.h (+1/-0) modules/http-client/json/http-client.xq.src/inform_data_read.cpp (+1/-0) modules/http-client/json/http-client.xq.src/inform_data_read.h (+1/-0) modules/http-client/json/http-client.xq.src/request_parser.cpp (+1/-0) modules/http-client/json/http-client.xq.src/request_parser.h (+1/-0) src/api/item.cpp (+4/-3) src/diagnostics/dict.cpp (+7/-1) src/system/globalenv.h (+6/-0) src/unit_tests/test_base64_streambuf.cpp (+9/-0) src/unit_tests/test_hexbinary_streambuf.cpp (+9/-0) test/unit/lib_unit_test.cpp (+8/-3) |
To merge this branch: | bzr merge lp:~paul-lucas/zorba/pjl-misc |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Brantner | Approve | ||
Paul J. Lucas | Approve | ||
Review via email: mp+201083@code.launchpad.net |
Commit message
Misc fixes.
Description of the change
Misc fixes.
To post a comment you must log in.
Validation queue starting for the following merge proposals: /code.launchpad .net/~paul- lucas/zorba/ pjl-misc/ +merge/ 201083
https:/
Progress dashboard at http:// jenkins. lambda. nu/view/ ValidationQueue