Merge branch 'lsf-walltime' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a1c3e83e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a1c3e83e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a1c3e83e Branch: refs/heads/master Commit: a1c3e83eb63774d2d33c3ff84dabda44ebc8935e Parents: 44f9493 7b48f15 Author: Marcus Christie <[email protected]> Authored: Tue May 9 13:11:07 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Tue May 9 13:11:07 2017 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 6 ++++++ .../org/apache/airavata/gfac/core/cluster/OutputParser.java | 2 +- .../org/apache/airavata/gfac/impl/job/LSFOutputParser.java | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
