You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/07/13 00:23:35 UTC
[1/2] git commit: Temporarity disabling integration tests as there
are left over processes
Repository: airavata
Updated Branches:
refs/heads/master 1e8331fd6 -> 92244d67e
Temporarity disabling integration tests as there are left over processes
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e019c864
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e019c864
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e019c864
Branch: refs/heads/master
Commit: e019c864848b45ba796c6cf4533d232be46ca3b5
Parents: 82f34a4
Author: Suresh Marru <sm...@apache.org>
Authored: Sat Jul 12 18:22:51 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sat Jul 12 18:22:51 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e019c864/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 80e75b1..694afb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -507,7 +507,7 @@
<module>modules/test-suite</module>
<module>modules/distribution</module>
<module>modules/ws-messenger</module>
- <module>modules/integration-tests</module>
+ <!--<module>modules/integration-tests</module>-->
</modules>
</profile>
<profile>
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/92244d67
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/92244d67
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/92244d67
Branch: refs/heads/master
Commit: 92244d67ee589207cf7ee45b367464338c25d368
Parents: e019c86 1e8331f
Author: Suresh Marru <sm...@apache.org>
Authored: Sat Jul 12 18:23:29 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sat Jul 12 18:23:29 2014 -0400
----------------------------------------------------------------------
.../api/server/handler/AiravataServerHandler.java | 14 +++++++++++---
.../apache/airavata/gfac/core/monitor/MonitorID.java | 13 ++++++++++++-
.../gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 10 ++++++++++
.../registry/jpa/impl/ProjectRegistry.java | 1 +
4 files changed, 34 insertions(+), 4 deletions(-)
----------------------------------------------------------------------