You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/04/10 17:50:28 UTC
[4/5] airavata git commit: Merge branch 'master' into emailMonitoring
Merge branch 'master' into emailMonitoring
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/042e25c7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/042e25c7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/042e25c7
Branch: refs/heads/emailMonitoring
Commit: 042e25c761d4356df12ff1d65382a9a814026044
Parents: 66ac6b9 fc20882
Author: shamrath <sh...@gmail.com>
Authored: Thu Apr 9 19:45:40 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Thu Apr 9 19:45:40 2015 -0400
----------------------------------------------------------------------
.../gfac/monitor/email/EmailBasedMonitor.java | 27 ++--
.../test-suite/multi-tenanted-airavata/README | 2 +-
.../test-suite/multi-tenanted-airavata/pom.xml | 29 ++++
.../ApplicationRegister.java | 147 +++++++++++--------
.../ComputeResourceRegister.java | 2 +-
.../ExperimentExecution.java | 140 ++++++++++--------
.../FrameworkBootstrapping.java | 2 +-
.../multitenantedairavata/GatewayRegister.java | 23 ++-
.../utils/FrameworkUtils.java | 54 +++++++
.../utils/TestFrameworkConstants.java | 3 +
.../main/resources/test-framework.properties | 3 +
11 files changed, 293 insertions(+), 139 deletions(-)
----------------------------------------------------------------------