Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D407B19883 for ; Wed, 30 Mar 2016 21:01:33 +0000 (UTC) Received: (qmail 47157 invoked by uid 500); 30 Mar 2016 21:01:33 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 47109 invoked by uid 500); 30 Mar 2016 21:01:33 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 47021 invoked by uid 99); 30 Mar 2016 21:01:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Mar 2016 21:01:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9044FE025B; Wed, 30 Mar 2016 21:01:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Wed, 30 Mar 2016 21:01:36 -0000 Message-Id: <3c5c08c22add42bba6833f21e0fb160c@git.apache.org> In-Reply-To: <5467ae8b4f59473eadadf0a9078a49b6@git.apache.org> References: <5467ae8b4f59473eadadf0a9078a49b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] airavata git commit: Merge branch 'develop' 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 Authored: Wed Mar 30 17:01:17 2016 -0400 Committer: Shameera Rathnayaka 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(-) ----------------------------------------------------------------------