Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8e421f42 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8e421f42 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8e421f42 Branch: refs/heads/develop Commit: 8e421f42c34013a9ad4020f8f1f8441470458b16 Parents: 101c8d4 20fe7b4 Author: Eroma Abeysinghe <eroma.abeysin...@gmail.com> Authored: Tue Jan 19 16:44:13 2016 -0500 Committer: Eroma Abeysinghe <eroma.abeysin...@gmail.com> Committed: Tue Jan 19 16:44:13 2016 -0500 ---------------------------------------------------------------------- .../server/OrchestratorServerHandler.java | 19 +++++------------- .../orchestrator/util/OrchestratorUtils.java | 21 ++++++++++++++++---- 2 files changed, 22 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
