Merge lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba

[Chris Hillery]

Split image into image + graphviz; split data-converters into csv + html.

[Chris Hillery (ceejatec)]

review: Approve

[Juan Zacarias (juan457)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/split-data-converters-and-image-2012-08-05T22-12-05.173Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job
  split-data-converters-and-image-2012-08-05T22-12-05.173Z is finished. The
  final status was:

  34 tests did not succeed - changes not commited.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/split-data-converters-and-image-2012-08-06T08-11-04.382Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job split-data-converters-and-image-2012-08-06T08-11-04.382Z is finished. The final status was:

All tests succeeded!

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-07-24 08:48:48 +0000
+++ modules/ExternalModules.conf	2012-08-04 06:15:24 +0000
@@ -26,15 +26,17 @@
 #   "tag" is the VCS tag to check out (optional - defaults to HEAD;
 #       currently only works for bzr, since svn tags are just different URLS)
 
+csv             bzr  lp:zorba/csv-module
 data-cleaning   bzr  lp:zorba/data-cleaning-module    zorba-2.5
-data-converters bzr  lp:zorba/data-converters-module  zorba-2.5
 data-formatting bzr  lp:zorba/data-formatting-module  zorba-2.5
 excel           bzr  lp:zorba/excel-module            zorba-2.5
 geo             bzr  lp:zorba/geo-module              zorba-2.5
-http-client     bzr  lp:zorba/http-client-module      zorba-2.5
-image           bzr  lp:zorba/image-module            zorba-2.5
+graphviz        bzr  lp:zorba/graphviz-module
+html            bzr  lp:zorba/html-module
+http-client     bzr  lp:zorba/http-client-module
+image           bzr  lp:zorba/image-module
 languages       bzr  lp:zorba/languages-module        zorba-2.5
-oauth           bzr  lp:zorba/oauth-module            zorba-2.5
+oauth           bzr  lp:zorba/oauth-module
 process         bzr  lp:zorba/process-module          zorba-2.5
 security        bzr  lp:zorba/security-module         zorba-2.5
 system          bzr  lp:zorba/system-module           zorba-2.5