Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7e7e3a96 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7e7e3a96 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7e7e3a96 Branch: refs/heads/master Commit: 7e7e3a969b6421a4cc968aa266337641923865e9 Parents: cf6304c 6d32024 Author: Shameera Rathnayaka <[email protected]> Authored: Wed Mar 23 11:00:17 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Wed Mar 23 11:00:17 2016 -0400 ---------------------------------------------------------------------- .../cpi/impl/SimpleOrchestratorImpl.java | 60 +++++++++++--------- 1 file changed, 34 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
