airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [2/2] git commit: Merge remote-tracking branch 'origin/master'
Date Thu, 13 Mar 2014 11:19:35 GMT
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/5b6e610b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5b6e610b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5b6e610b

Branch: refs/heads/master
Commit: 5b6e610b2d672388edabca8e98aa7b89287ea349
Parents: 1441a83 bf37ea8
Author: Suresh Marru <smarru@apache.org>
Authored: Thu Mar 13 07:19:30 2014 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Thu Mar 13 07:19:30 2014 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |  37 +++--
 .../samples/CreateLaunchExperimentUS3.java      |  24 +--
 .../apache/airavata/job/monitor/MonitorID.java  |   6 +
 .../airavata/job/monitor/MonitorManager.java    |   1 +
 .../monitor/impl/pull/qstat/QstatMonitor.java   |   2 +-
 .../impl/pull/qstat/ResourceConnection.java     |   6 +-
 .../impl/push/amqp/JSONMessageParser.java       |   7 +-
 .../src/main/resources/conf/gfac-config.xml     |  32 ++--
 .../org/apache/airavata/gfac/Constants.java     |   4 +-
 .../org/apache/airavata/gfac/cpi/GFacImpl.java  |  14 ++
 .../gfac/handler/AdvancedSCPInputHandler.java   | 149 +++++++++++++++++++
 .../gfac/handler/AdvancedSCPOutputHandler.java  | 110 ++++++++++++++
 .../gfac/handler/AppDescriptorCheckHandler.java |   7 +-
 .../airavata/gfac/handler/SCPOutputHandler.java |  62 ++++++--
 .../gfac/provider/impl/GSISSHProvider.java      |   2 +-
 .../apache/airavata/gfac/utils/GFacUtils.java   |   2 +
 .../registry/jpa/impl/ExperimentRegistry.java   |   7 +
 .../AdvanceInputDataHandlingResource.java       |   8 +-
 .../AdvancedOutputDataHandlingResource.java     |   9 +-
 .../jpa/resources/QosParamResource.java         |   8 +-
 .../apache/airavata/gsi/ssh/api/Cluster.java    |   9 ++
 .../airavata/gsi/ssh/api/job/OutputParser.java  |   9 +-
 .../gsi/ssh/api/job/SlurmOutputParser.java      |  14 +-
 .../gsi/ssh/impl/GSISSHAbstractCluster.java     |  19 ++-
 .../apache/airavata/gsi/ssh/util/SSHUtils.java  |  35 +++++
 25 files changed, 496 insertions(+), 87 deletions(-)
----------------------------------------------------------------------



Mime
View raw message