Merge branch 'master' into orchestratorJobCountImprovment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/459b7cbf Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/459b7cbf Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/459b7cbf Branch: refs/heads/orchestratorJobThrottleFeature Commit: 459b7cbfb79806fa0ef15c00f5426bd778897126 Parents: 9eddff9 6a11b29 Author: shamrath <[email protected]> Authored: Tue Sep 23 16:17:25 2014 -0400 Committer: shamrath <[email protected]> Committed: Tue Sep 23 16:17:25 2014 -0400 ---------------------------------------------------------------------- .../apache/airavata/gfac/core/utils/OutputUtils.java | 12 +++++------- .../gfac/gsissh/handler/GSISSHOutputHandler.java | 2 ++ .../gfac/ssh/handler/AdvancedSCPOutputHandler.java | 3 +++ .../airavata/gfac/ssh/handler/SSHOutputHandler.java | 5 ++++- 4 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/459b7cbf/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java ----------------------------------------------------------------------
