airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [2/5] git commit: Merge remote-tracking branch 'origin/master'
Date Mon, 25 Aug 2014 15:22:26 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/91dc82dc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/91dc82dc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/91dc82dc

Branch: refs/heads/master
Commit: 91dc82dc05a3be2d64adaf4111795be4137a7d75
Parents: bedf7c0 83cb4bf
Author: Suresh Marru <smarru@apache.org>
Authored: Wed Aug 20 01:29:48 2014 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Wed Aug 20 01:29:48 2014 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |   37 +
 .../java/org/apache/airavata/api/Airavata.java  | 6908 +++++++++++-------
 .../main/resources/lib/airavata/Airavata.cpp    |  963 ++-
 .../src/main/resources/lib/airavata/Airavata.h  |  167 +
 .../lib/airavata/Airavata_server.skeleton.cpp   |    5 +
 .../resources/lib/Airavata/API/Airavata.php     |  657 +-
 .../client/samples/CancelExperiments.java       |    2 +-
 .../client/samples/CreateLaunchExperiment.java  |    4 +-
 .../samples/TestCreateLaunchExperiment.java     |   29 +-
 .../airavataAPI.thrift                          |   11 +-
 .../airavata/gfac/core/cpi/BetterGfacImpl.java  |    6 -
 .../core/monitor/AiravataTaskStatusUpdator.java |    2 +
 .../airavata/gfac/core/utils/GFacUtils.java     |   48 +-
 .../gsissh/provider/impl/GSISSHProvider.java    |   19 +-
 .../gfac/ssh/provider/impl/SSHProvider.java     |   49 +-
 .../server/OrchestratorServerHandler.java       |    3 +
 .../util/OrchestratorRecoveryHandler.java       |    7 +-
 .../core/impl/GFACServiceJobSubmitter.java      |    4 +-
 .../registry/jpa/impl/ExperimentRegistry.java   |   71 +-
 .../registry/jpa/resources/WorkerResource.java  |   33 +
 .../airavata/registry/cpi/utils/Constants.java  |    2 +
 .../gsi/ssh/api/job/SlurmJobConfiguration.java  |    2 +-
 .../gsi/ssh/impl/GSISSHAbstractCluster.java     |    2 +-
 23 files changed, 5812 insertions(+), 3219 deletions(-)
----------------------------------------------------------------------



Mime
View raw message