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/e0b674c5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e0b674c5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e0b674c5 Branch: refs/heads/master Commit: e0b674c5f102ab820ef99d016e92d8f37f06c435 Parents: f0198a4 6c301e6 Author: Shameera Rathnayaka <[email protected]> Authored: Wed Mar 30 17:01:17 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Wed Mar 30 17:01:17 2016 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 10 ------- modules/cloud/pom.xml | 19 +++++++++++++ .../org/apache/airavata/cloud/CloudMain.java | 28 ++++++++++++++++++++ pom.xml | 1 + 4 files changed, 48 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
