Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/count-opt into lp:zorba

2013-03-24 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog text conflict in src/compiler/rewriter/rules/fold_rules.cpp text conflict in src/runtime/core/path_iterators.cpp text conflict in src/runtime/json/jsoniq_functions_impl.cpp -- https://code.launchpad.net/~zorba-cod

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/count-opt into lp:zorba

2013-03-23 Thread Matthias Brantner
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/count-opt/+merge/148586 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-code

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/count-opt into lp:zorba

2013-02-15 Thread Markos Zaharioudakis
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/count-opt/+merge/148586 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-code

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/count-opt into lp:zorba

2013-02-15 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 3 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/count-opt/+merge/148586 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.ne

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/count-opt into lp:zorba

2013-02-15 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/count-opt into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job count-opt-2013-02-15T19-19-58.943Z is finished. The final stat