Merge lp:~zorba-coders/zorba/threads into lp:zorba

Proposed by Markos Zaharioudakis
Status: Merged
Merged at revision: 11581
Proposed branch: lp:~zorba-coders/zorba/threads
Merge into: lp:zorba
Diff against target: 21 lines (+2/-2)
1 file modified
modules/ExternalModules.conf (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/threads
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+178624@code.launchpad.net

Commit message

re-enabled languages and schema tools modules

Description of the change

re-enabled languages and schema tools modules

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue succeeded - proposal merged!

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-08-05 15:31:02 +0000
3+++ modules/ExternalModules.conf 2013-08-05 19:23:28 +0000
4@@ -39,7 +39,7 @@
5 http-client bzr lp:zorba/http-client-module zorba-2.9
6 image bzr lp:zorba/image-module
7 jdbc bzr lp:zorba/jdbc-module
8-#languages bzr lp:zorba/languages-module
9+languages bzr lp:zorba/languages-module
10 oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module
11 oauth bzr lp:zorba/oauth-module zorba-2.9
12 process bzr lp:zorba/process-module
13@@ -48,7 +48,7 @@
14 system bzr lp:zorba/system-module zorba-2.9
15 email bzr lp:zorba/email-module
16 util-jvm bzr lp:zorba/util-jvm-module
17-#schema-tools bzr lp:zorba/schema-tools-module
18+schema-tools bzr lp:zorba/schema-tools-module
19 stack bzr lp:zorba/stack-module
20 queue bzr lp:zorba/queue-module
21 couchbase bzr lp:zorba/couchbase-module

Subscribers

People subscribed via source and target branches