airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Fri, 07 Mar 2014 20:51:30 GMT
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/1f298eab
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1f298eab
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1f298eab

Branch: refs/heads/master
Commit: 1f298eabd66e847b9c656a11a4dfcd1d3c7bf906
Parents: 9e71880 4932605
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Fri Mar 7 15:51:03 2014 -0500
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Fri Mar 7 15:51:03 2014 -0500

----------------------------------------------------------------------
 .../java-client-samples/pom.xml                 |   6 +-
 .../client/samples/CreateLaunchExperiment.java  |  67 ++++++++++-
 .../main/resources/airavata-client.properties   |   8 +-
 .../airavata/client/tools/DocumentCreator.java  | 116 ++++++++++++++++++-
 .../monitor/impl/pull/qstat/QstatMonitor.java   |   2 +
 .../impl/pull/qstat/ResourceConnection.java     |   4 +-
 .../airavata/job/monitor/state/JobStatus.java   |  17 ++-
 .../test/resources/airavata-server.properties   |   2 +-
 .../resources/conf/airavata-client.properties   |   2 +-
 .../test/resources/airavata-server.properties   |   2 +-
 .../test/resources/airavata-server.properties   |   2 +-
 .../main/resources/airavata-server.properties   |   2 +-
 .../test/resources/airavata-server.properties   |   2 +-
 .../main/resources/airavata-client.properties   |   2 +-
 .../main/resources/airavata-server.properties   |   2 +-
 .../test/resources/airavata-server.properties   |   2 +-
 .../registry/jpa/impl/ExperimentRegistry.java   |   2 +-
 .../test/resources/airavata-client.properties   |   2 +-
 .../main/resources/airavata-server.properties   |   2 +-
 .../gsi/ssh/api/job/SlurmOutputParser.java      |  14 +--
 20 files changed, 225 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/1f298eab/modules/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------


Mime
View raw message