Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Merging the changes for AIRAVATA-1077 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0a46c0cb Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0a46c0cb Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0a46c0cb Branch: refs/heads/master Commit: 0a46c0cba6a9a05cc3cc76c95af01e18acb89b5d Parents: 9643198 7a8838f Author: raminder <[email protected]> Authored: Wed Mar 12 17:39:22 2014 -0400 Committer: raminder <[email protected]> Committed: Wed Mar 12 17:39:22 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 37 +++++++++----------- .../registry/jpa/impl/ExperimentRegistry.java | 4 +++ .../jpa/resources/QosParamResource.java | 8 +++-- .../airavata/gsi/ssh/api/job/OutputParser.java | 9 ++--- .../gsi/ssh/api/job/SlurmOutputParser.java | 12 ++++--- .../gsi/ssh/impl/GSISSHAbstractCluster.java | 1 - 6 files changed, 38 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/0a46c0cb/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java ----------------------------------------------------------------------
