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/75fd7e40 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/75fd7e40 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/75fd7e40 Branch: refs/heads/master Commit: 75fd7e40c5f2f193cedb9d46e1d13b18fb279864 Parents: bdd025e 5ea8f2c Author: lahiru <[email protected]> Authored: Wed Sep 24 13:03:13 2014 -0400 Committer: lahiru <[email protected]> Committed: Wed Sep 24 13:03:13 2014 -0400 ---------------------------------------------------------------------- .../server/src/main/resources/SGETemplate.xslt | 2 +- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 3 +-- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 2 +- .../gfac/ssh/handler/AdvancedSCPOutputHandler.java | 2 +- .../airavata/gsi/ssh/api/job/SGEOutputParser.java | 16 ++++++++++------ .../org/apache/airavata/gsi/ssh/impl/JobStatus.java | 4 +++- 6 files changed, 17 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/75fd7e40/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/75fd7e40/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java ----------------------------------------------------------------------
