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/5be53c73 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5be53c73 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5be53c73 Branch: refs/heads/master Commit: 5be53c7306f1c1c8368e3da18ad8c0a320a93d68 Parents: cc0a8f9 cf82465 Author: shamrath <[email protected]> Authored: Fri Apr 17 17:32:22 2015 -0400 Committer: shamrath <[email protected]> Committed: Fri Apr 17 17:32:22 2015 -0400 ---------------------------------------------------------------------- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 44 +++++++++++++++++++- .../ApplicationRegister.java | 1 + .../ExperimentExecution.java | 16 +++---- .../FrameworkBootstrapping.java | 8 +++- .../src/main/resources/test-framework.json | 2 +- 5 files changed, 58 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
