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/7d391f11 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7d391f11 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7d391f11 Branch: refs/heads/master Commit: 7d391f11a7d660a508febdd76566a486fceb8ff1 Parents: 0f5ec6f ec9b6fe Author: shamrath <[email protected]> Authored: Wed May 13 11:07:12 2015 -0400 Committer: shamrath <[email protected]> Committed: Wed May 13 11:07:12 2015 -0400 ---------------------------------------------------------------------- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 39 +++-- .../server/OrchestratorServerHandler.java | 143 +++++++++---------- 2 files changed, 85 insertions(+), 97 deletions(-) ----------------------------------------------------------------------
