Merge lp:~zorba-coders/zorba/bug-1180220-fix-moduleconf into lp:zorba

Proposed by Chris Hillery
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 11505
Merged at revision: 11505
Proposed branch: lp:~zorba-coders/zorba/bug-1180220-fix-moduleconf
Merge into: lp:zorba
Diff against target: 13 lines (+1/-2)
1 file modified
modules/ExternalModules.conf (+1/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1180220-fix-moduleconf
Reviewer Review Type Date Requested Status
Paul J. Lucas Approve
Chris Hillery Approve
Review via email: mp+168832@code.launchpad.net

Commit message

Restore normal trunk branches for modules.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
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 bug-1180220-fix-moduleconf-2013-06-12T00-01-16.384Z 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 'modules/ExternalModules.conf'
2--- modules/ExternalModules.conf 2013-06-07 05:58:11 +0000
3+++ modules/ExternalModules.conf 2013-06-11 23:59:28 +0000
4@@ -27,8 +27,7 @@
5 # currently only works for bzr, since svn tags are just different URLS)
6
7 archive bzr lp:zorba/archive-module zorba-2.9
8-#csv bzr lp:zorba/csv-module
9-csv bzr lp:~zorba-coders/zorba/bug-1180220-util-jvm
10+csv bzr lp:zorba/csv-module
11 data-cleaning bzr lp:zorba/data-cleaning-module
12 data-formatting bzr lp:zorba/data-formatting-module
13 excel bzr lp:zorba/excel-module zorba-2.9

Subscribers

People subscribed via source and target branches