Merge lp:~zorba-coders/zorba/add-archive-module into lp:zorba

[Matthias Brantner]

added the archive module to ExternalModules.conf and the ChangeLog

added the archive module to ExternalModules.conf and the ChangeLog

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/add-archive-module-2012-07-20T23-02-11.075Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job add-archive-module-2012-07-20T23-02-11.075Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 3 Pending.

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/add-archive-module-2012-07-27T01-02-05.877Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/add-archive-module 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 add-archive-module-2012-07-27T01-02-05.877Z is
  finished. The final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

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

[Chris Hillery (ceejatec)]

Changelog refers to old archive module URI.

review: Needs Fixing

[Matthias Brantner (matthias-brantner)]

> Changelog refers to old archive module URI.
fixed

[Chris Hillery (ceejatec)]

review: Approve

[Juan Zacarias (juan457)]

review: Approve

[Luis Rodriguez Gonzalez (kuraru)]

Seems OK.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in ChangeLog

[lp:~zorba-coders/zorba/add-archive-module]

10952. By Chris Hillery on 2012-08-15

Merge from trunk.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/add-archive-module-2012-08-15T07-45-11.735Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job add-archive-module-2012-08-15T07-45-11.735Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-07-27 02:49:06 +0000
+++ ChangeLog	2012-07-27 16:17:21 +0000
@@ -18,6 +18,8 @@
   * Added support for fragments to fn:path
   * Positional pagination support for collections
   * Incremental maintenance for general indexes.
+  * http://www.zorba-xquery.com/modules/archive module for creating, reading, and updating
+    various (compressed) archives (e.g. zip, tar.gz, or tar.bz2)
 	
 Optimizations:
   * Small optimization of comparison operations.
 
=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-07-24 08:48:48 +0000
+++ modules/ExternalModules.conf	2012-07-27 16:17:21 +0000
@@ -44,3 +44,4 @@
 schema-tools    bzr  lp:zorba/schema-tools-module     zorba-2.5
 stack           bzr  lp:zorba/stack-module            zorba-2.5
 queue           bzr  lp:zorba/queue-module            zorba-2.5
+archive         bzr  lp:zorba/archive-module