Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d959615e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d959615e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d959615e Branch: refs/heads/develop Commit: d959615ed5e3e357acb54c27b9647175b3584c27 Parents: c22a73d 98fc3f5 Author: scnakandala <[email protected]> Authored: Wed Jan 6 22:53:00 2016 -0500 Committer: scnakandala <[email protected]> Committed: Wed Jan 6 22:53:00 2016 -0500 ---------------------------------------------------------------------- .../airavata/gfac/impl/GFacEngineImpl.java | 3 +- .../apache/airavata/gfac/impl/GFacWorker.java | 32 +++----------- .../airavata/gfac/server/GfacServerHandler.java | 44 +++++++++++++------- 3 files changed, 38 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
