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 1108118ADE for ; Fri, 11 Mar 2016 06:57:19 +0000 (UTC) Received: (qmail 29816 invoked by uid 500); 11 Mar 2016 06:57:18 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 29615 invoked by uid 500); 11 Mar 2016 06:57:18 -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 28997 invoked by uid 99); 11 Mar 2016 06:57:18 -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; Fri, 11 Mar 2016 06:57:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 02AEBE0556; Fri, 11 Mar 2016 06:57:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smarru@apache.org To: commits@airavata.apache.org Date: Fri, 11 Mar 2016 06:57:32 -0000 Message-Id: <6ed24e7f3c0a426d9fe72311d3068b8c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/16] airavata git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/39483e48 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/39483e48 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/39483e48 Branch: refs/heads/master Commit: 39483e4866b95d8e4e4b827a09f994291d91b8b6 Parents: 6c4b50f 630c751 Author: Suresh Marru Authored: Fri Mar 11 01:56:58 2016 -0500 Committer: Suresh Marru Committed: Fri Mar 11 01:56:58 2016 -0500 ---------------------------------------------------------------------- .../gateway_resource_profile_model_types.cpp | 22 +++++++++++++++++++ .../gateway_resource_profile_model_types.h | 12 ++++++++-- .../Model/AppCatalog/GatewayProfile/Types.php | 23 ++++++++++++++++++++ .../model/appcatalog/gatewayprofile/ttypes.py | 15 ++++++++++++- 4 files changed, 69 insertions(+), 3 deletions(-) ----------------------------------------------------------------------