Merge lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Proposed by
Sorin Marian Nasoi
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 11596 | ||||
Proposed branch: | lp:~zorba-coders/zorba/partial_fix_bug_1167641 | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
68 lines (+14/-6) 3 files modified
test/fots/CMakeLists.txt (+1/-0) test/fots_driver/environment.xq (+10/-5) test/fots_driver/fots-driver.xq (+3/-1) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/partial_fix_bug_1167641 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | Approve | ||
Sorin Marian Nasoi | Approve | ||
Review via email: mp+179741@code.launchpad.net |
Commit message
Re-added changes that were wrongfully reverted in r11402.1.5.
To post a comment you must log in.
Validation queue starting for the following merge proposals: /code.launchpad .net/~zorba- coders/ zorba/partial_ fix_bug_ 1167641/ +merge/ 179741
https:/
Progress dashboard at http:// jenkins. lambda. nu/view/ ValidationQueue