Merge lp:~zorba-coders/zorba/project_tag_jdbc into lp:zorba/jdbc-module

Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Sorin Marian Nasoi
Approved revision: 55
Merged at revision: 55
Proposed branch: lp:~zorba-coders/zorba/project_tag_jdbc
Merge into: lp:zorba/jdbc-module
Diff against target: 12 lines (+1/-1)
1 file modified
src/jdbc.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/project_tag_jdbc
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Sorin Marian Nasoi Approve
Review via email: mp+169638@code.launchpad.net

Commit message

- updated project TAG

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/project_tag_jdbc into lp:zorba/jdbc-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message):
  Validation queue job project_tag_jdbc-2013-06-16T01-45-49.948Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job project_tag_jdbc-2013-06-17T12-15-46.764Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/jdbc.xq'
--- src/jdbc.xq 2013-06-11 21:44:04 +0000
+++ src/jdbc.xq 2013-06-15 17:04:24 +0000
@@ -21,7 +21,7 @@
21 : using jvm-util module to handle Java interaction.21 : using jvm-util module to handle Java interaction.
22 :22 :
23 : @author Rodolfo Ochoa23 : @author Rodolfo Ochoa
24 : @project other data sources/jdbc module24 : @project DB Drivers/JDBC
25 :)25 :)
2626
27module namespace jdbc = "http://www.zorba-xquery.com/modules/jdbc";27module namespace jdbc = "http://www.zorba-xquery.com/modules/jdbc";

Subscribers

People subscribed via source and target branches

to all changes: