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/65093348 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/65093348 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/65093348 Branch: refs/heads/master Commit: 65093348446c86cf1f94c84086c5ca8c2065d1f0 Parents: 42fee53 2b0b6a2 Author: lahiru <[email protected]> Authored: Fri Oct 3 16:05:57 2014 -0400 Committer: lahiru <[email protected]> Committed: Fri Oct 3 16:05:57 2014 -0400 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 12 ++++++------ .../core/monitor/AiravataJobStatusUpdator.java | 2 +- .../core/monitor/AiravataTaskStatusUpdator.java | 8 ++++---- .../gfac/gsissh/handler/GSISSHOutputHandler.java | 15 ++++++++++++--- .../gfac/ssh/handler/SSHOutputHandler.java | 17 +++++++++++++---- .../jpa/resources/DataTransferDetailResource.java | 2 ++ .../registry/jpa/resources/ExperimentResource.java | 2 ++ .../registry/jpa/resources/JobDetailResource.java | 2 ++ .../registry/jpa/resources/TaskDetailResource.java | 5 +++-- .../jpa/resources/WorkflowNodeDetailResource.java | 2 ++ 10 files changed, 47 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
