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/a665aa56 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a665aa56 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a665aa56 Branch: refs/heads/master Commit: a665aa56a1b8843ee43eff12e6feb7bcdab10378 Parents: ccdf5c4 02aa95b Author: shamrath <[email protected]> Authored: Fri Apr 24 13:58:40 2015 -0400 Committer: shamrath <[email protected]> Committed: Fri Apr 24 13:58:40 2015 -0400 ---------------------------------------------------------------------- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 2 +- .../server/OrchestratorServerHandler.java | 51 +++---- .../ComputeResourceRegister.java | 5 +- .../ExperimentExecution.java | 144 ++++++++++--------- .../FrameworkBootstrapping.java | 4 +- .../TestFrameworkProps.java | 10 ++ .../src/main/resources/test-framework.json | 7 +- 7 files changed, 115 insertions(+), 108 deletions(-) ----------------------------------------------------------------------
