You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/04/28 20:10:16 UTC
[1/2] git commit: fixing the build break
Repository: airavata
Updated Branches:
refs/heads/master bca756a48 -> 64c6657e7
fixing the build break
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c1f69ae2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c1f69ae2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c1f69ae2
Branch: refs/heads/master
Commit: c1f69ae2901dc88d9ceb6d49ba5d77fbaf3ecc4b
Parents: a2307f9
Author: lahiru <la...@apache.org>
Authored: Mon Apr 28 14:08:59 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Mon Apr 28 14:08:59 2014 -0400
----------------------------------------------------------------------
modules/gfac/pom.xml | 2 +-
modules/orchestrator/orchestrator-core/pom.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c1f69ae2/modules/gfac/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/pom.xml b/modules/gfac/pom.xml
index 774a445..1d6f0d1 100644
--- a/modules/gfac/pom.xml
+++ b/modules/gfac/pom.xml
@@ -35,7 +35,7 @@
<module>gfac-ssh</module>
<module>gfac-local</module>
<module>gfac-hadoop</module>
- <module>gfac-gram</module>
+ <module>gfac-gram</module>
<module>gfac-gsissh</module>
<module>gfac-bes</module>
</modules>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c1f69ae2/modules/orchestrator/orchestrator-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml
index b228284..c2085b5 100644
--- a/modules/orchestrator/orchestrator-core/pom.xml
+++ b/modules/orchestrator/orchestrator-core/pom.xml
@@ -60,6 +60,11 @@ the License. -->
<artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-gfac-local</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/64c6657e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/64c6657e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/64c6657e
Branch: refs/heads/master
Commit: 64c6657e7c73c26ff74789d72a80236af6692cc5
Parents: c1f69ae bca756a
Author: lahiru <la...@apache.org>
Authored: Mon Apr 28 14:09:21 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Mon Apr 28 14:09:21 2014 -0400
----------------------------------------------------------------------
.../src/main/resources/registry-derby.sql | 32 ++++++++---------
.../src/main/resources/registry-mysql.sql | 32 ++++++++---------
.../src/test/resources/registry-derby.sql | 32 ++++++++---------
.../src/test/resources/registry-derby.sql | 32 ++++++++---------
.../registry/jpa/impl/ExperimentRegistry.java | 36 ++++++++++++++++----
.../src/main/resources/registry-derby.sql | 32 ++++++++---------
.../src/main/resources/registry-mysql.sql | 32 ++++++++---------
.../src/test/resources/registry-derby.sql | 32 ++++++++---------
8 files changed, 142 insertions(+), 118 deletions(-)
----------------------------------------------------------------------