Merge lp:~zorba-coders/zorba/bug_900462 into lp:~zorba-coders/zorba/data-converters-module
Proposed by
Sorin Marian Nasoi
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Matthias Brantner | ||||
Approved revision: | 78 | ||||
Merged at revision: | 77 | ||||
Proposed branch: | lp:~zorba-coders/zorba/bug_900462 | ||||
Merge into: | lp:~zorba-coders/zorba/data-converters-module | ||||
Diff against target: |
117 lines (+14/-19) 11 files modified
src/com/zorba-xquery/www/modules/converters/CMakeLists.txt (+0/-2) src/com/zorba-xquery/www/modules/converters/json.xq.src/jansson_wrapper.cpp (+5/-8) test_json/ExpQueryResults/converters/jansson/serialize_json_01.xml.res (+1/-1) test_json/ExpQueryResults/converters/jansson/serialize_json_02.xml.res (+1/-1) test_json/ExpQueryResults/converters/jansson/serialize_json_04.xml.res (+1/-1) test_json/ExpQueryResults/converters/jansson/serialize_json_05.xml.res (+1/-1) test_json/ExpQueryResults/converters/jansson/serialize_json_09.xml.res (+1/-1) test_json/ExpQueryResults/converters/jansson/serialize_json_13.xml.res (+1/-1) test_json/ExpQueryResults/converters/jansson/serialize_json_14.xml.res (+1/-1) test_json/ExpQueryResults/converters/jansson/serialize_json_15.xml.res (+1/-1) test_json/ExpQueryResults/converters/jansson/serialize_json_16.xml.res (+1/-1) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug_900462 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Brantner | Approve | ||
Sorin Marian Nasoi | Approve | ||
Review via email: mp+84826@code.launchpad.net |
Commit message
Fixed bug #900462 (json:serialize returns invalid json)
Description of the change
Fixed bug #900462 (json:serialize returns invalid json)
To post a comment you must log in.
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ bug_900462- 2011-12- 07T19-04- 45.45Z/ log.html
Log at: http://