Zorba

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

  1. add-archive-module
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Approved by: Chris Hillery
Approved revision: 10952
Merged at revision: 10987
Proposed branch: lp:~zorba-coders/zorba/add-archive-module
Merge into: lp:zorba
Diff against target: 21 lines (+3/-0)
2 files modified
ChangeLog (+2/-0)
modules/ExternalModules.conf (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/add-archive-module
Reviewer Review Type Date Requested Status
Luis Rodriguez Gonzalez Approve
Juan Zacarias Approve
Chris Hillery Approve
Matthias Brantner Approve
Review via email: mp+116086@code.launchpad.net

Commit message

added the archive module to ExternalModules.conf and the ChangeLog

Description of the change

added the archive module to ExternalModules.conf and the ChangeLog

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

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

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

All tests succeeded!

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

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

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

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

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

Revision history for this message
Chris Hillery (ceejatec) wrote :

Changelog refers to old archive module URI.

review: Needs Fixing
Revision history for this message
Matthias Brantner (matthias-brantner) wrote :

> Changelog refers to old archive module URI.
fixed

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Luis Rodriguez Gonzalez (kuraru) wrote :

Seems OK.

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

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

text conflict in ChangeLog

lp:~zorba-coders/zorba/add-archive-module updated
10952. By Chris Hillery

Merge from trunk.

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

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

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

Validation queue job add-archive-module-2012-08-15T07-45-11.735Z 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 'ChangeLog'
2--- ChangeLog 2012-07-27 02:49:06 +0000
3+++ ChangeLog 2012-07-27 16:17:21 +0000
4@@ -18,6 +18,8 @@
5 * Added support for fragments to fn:path
6 * Positional pagination support for collections
7 * Incremental maintenance for general indexes.
8+ * http://www.zorba-xquery.com/modules/archive module for creating, reading, and updating
9+ various (compressed) archives (e.g. zip, tar.gz, or tar.bz2)
10
11 Optimizations:
12 * Small optimization of comparison operations.
13
14=== modified file 'modules/ExternalModules.conf'
15--- modules/ExternalModules.conf 2012-07-24 08:48:48 +0000
16+++ modules/ExternalModules.conf 2012-07-27 16:17:21 +0000
17@@ -44,3 +44,4 @@
18 schema-tools bzr lp:zorba/schema-tools-module zorba-2.5
19 stack bzr lp:zorba/stack-module zorba-2.5
20 queue bzr lp:zorba/queue-module zorba-2.5
21+archive bzr lp:zorba/archive-module

Subscribers

People subscribed via source and target branches