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/99dd1bac Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/99dd1bac Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/99dd1bac Branch: refs/heads/master Commit: 99dd1bacc839ae7051fb8ac10eb07c5323c67d33 Parents: 2ea8b5c 0f7a194 Author: raminder <[email protected]> Authored: Fri Mar 7 12:22:28 2014 -0500 Committer: raminder <[email protected]> Committed: Fri Mar 7 12:22:28 2014 -0500 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 2 +- .../airavata/client/tools/DocumentCreator.java | 1 + .../job/monitor/AiravataJobStatusUpdator.java | 3 ++ .../apache/airavata/job/monitor/MonitorID.java | 9 ---- .../monitor/impl/pull/qstat/QstatMonitor.java | 6 +-- .../impl/pull/qstat/ResourceConnection.java | 3 +- .../gsi/ssh/api/job/SlurmOutputParser.java | 44 +++++++++++++++++++- .../apache/airavata/gsi/ssh/impl/JobStatus.java | 24 ++++++++++- 8 files changed, 73 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/99dd1bac/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/99dd1bac/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java ----------------------------------------------------------------------
