Merge lp:~zorba-coders/zorba/bug-1031287 into lp:zorba
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Chris Hillery on 2012-07-31 | ||||
Approved revision: | 10960 | ||||
Merged at revision: | 10962 | ||||
Proposed branch: | lp:~zorba-coders/zorba/bug-1031287 | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
32 lines (+3/-3) 2 files modified
src/compiler/translator/translator.cpp (+1/-1) src/store/naive/json_loader.cpp (+2/-2) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug-1031287 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | 2012-07-31 | Approve on 2012-07-31 | |
Matthias Brantner | 2012-07-31 | Approve on 2012-07-31 | |
Review via email:
|
Commit message
Fixing Windows build with JSONiq.
Description of the change
Fixing Windows build with JSONiq.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job bug-1031287-2012-07-
All tests succeeded!
Zorba Build Bot (zorba-buildbot) wrote : | # |
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Pending.
Ghislain Fourny (gislenius) wrote : | # |
Windows seems to now correctly build, and test results show no apparent regression.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1031287 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1031287-2012-07-
final status was:
1 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job bug-1031287-2012-07-
All tests succeeded!
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ bug-1031287- 2012-07- 31T10-13- 57.498Z/ log.html
Log at: http://