Merge lp:~zorba-coders/zorba/project_tag_system into lp:zorba/system-module

Proposed by Sorin Marian Nasoi on 2013-06-15
Status: Merged
Approved by: Sorin Marian Nasoi on 2013-06-17
Approved revision: 36
Merged at revision: 36
Proposed branch: lp:~zorba-coders/zorba/project_tag_system
Merge into: lp:zorba/system-module
Diff against target: 11 lines (+1/-1)
1 file modified
src/com/zorba-xquery/www/modules/system.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/project_tag_system
Reviewer Review Type Date Requested Status
Chris Hillery 2013-06-15 Approve on 2013-06-15
Sorin Marian Nasoi Approve on 2013-06-15
Review via email: mp+169630@code.launchpad.net

Commit message

- updated project TAG

To post a comment you must log in.
review: Approve
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/project_tag_system into lp:zorba/system-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_system-2013-06-16T00-04-43.331Z 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

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job project_tag_system-2013-06-17T11-49-41.892Z 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
1=== modified file 'src/com/zorba-xquery/www/modules/system.xq'
2--- src/com/zorba-xquery/www/modules/system.xq 2012-09-27 16:57:24 +0000
3+++ src/com/zorba-xquery/www/modules/system.xq 2013-06-15 16:54:27 +0000
4@@ -41,7 +41,7 @@
5 : with the key env.PATH.
6 :
7 : @author Markus Pilman
8- : @project Zorba/IO/System
9+ : @project Zorba/Input Output/System
10 :)
11 module namespace system = 'http://www.zorba-xquery.com/modules/system';
12

Subscribers

People subscribed via source and target branches

to all changes: