[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1124273 into lp:zorba

2013-02-13 Thread Matthias Brantner
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-1124273 into lp:zorba. Commit message: fix for bug 1124273 (xqdoc crash because of annotation literals) Requested reviews: Chris Hillery (ceejatec) Related bugs: Bug #1124273 in Zorba: xqdoc crash because of annotation

[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba

2013-02-13 Thread Nicolae Brinza
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/148300 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/148300

[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba

2013-02-13 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-02-13T19-34-50.26Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/148300 Your team Zorba Coders is requested to review the proposed merge of

[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba

2013-02-13 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/error-messages into lp:zorba. Commit message: Test merge to check the new FOTS remote queue. Requested reviews: Zorba Coders (zorba-coders) Related bugs: Bug #855533 in Zorba: parser error messages should contain the actual value of the

[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba

2013-02-13 Thread Zorba Build Bot
Validation queue job error-messages-2013-02-13T19-34-50.26Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/148300 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages

Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba

2013-02-13 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/148300 Your team Zorba Coders is requested to review the proposed merge of

[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba

2013-02-13 Thread Zorba Build Bot
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/148300 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/148300

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1124273 into lp:zorba

2013-02-13 Thread Matthias Brantner
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1124273/+merge/148229 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 :

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module

2013-02-13 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module has been updated. Commit Message changed to: Fixed Window warnings, and added size to the new zip file when updating or deleting For more details, see:

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module

2013-02-13 Thread Zorba Build Bot
Attempt to merge into lp:zorba/archive-module failed due to conflicts: text conflict in src/archive_module.xq.src/archive_module.cpp -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/120438 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module

2013-02-13 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/120438 --

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1124273 into lp:zorba

2013-02-13 Thread Chris Hillery
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1124273/+merge/148229 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 :

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1124273 into lp:zorba

2013-02-13 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/bug-1124273 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1124273/+merge/148229 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1124273 into lp:zorba

2013-02-13 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1124273-2013-02-14T03-10-43.902Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1124273/+merge/148229 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1124273 into lp:zorba

2013-02-13 Thread Zorba Build Bot
Validation queue job bug-1124273-2013-02-14T03-10-43.902Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1124273/+merge/148229 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1124273 into lp:zorba

2013-02-13 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/bug-1124273 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1124273/+merge/148229 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1124273/+merge/148229

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module

2013-02-13 Thread Chris Hillery
Luis - please fix the merge conflict in archive_module.cpp. I tried to do it, but it looks like some of the changes were added independently on the module trunk and I'm not sure how to resolve the differences. --