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 C9F6F1845F for ; Tue, 1 Mar 2016 19:20:40 +0000 (UTC) Received: (qmail 49297 invoked by uid 500); 1 Mar 2016 19:20:40 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 49180 invoked by uid 500); 1 Mar 2016 19:20:40 -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 48934 invoked by uid 99); 1 Mar 2016 19:20:40 -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; Tue, 01 Mar 2016 19:20:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58613E0098; Tue, 1 Mar 2016 19:20:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Tue, 01 Mar 2016 19:20:50 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/15] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/ba651fe2 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ba651fe2 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ba651fe2 Branch: refs/heads/master Commit: ba651fe2b7ca9d09dd6a5b8fc90dfc276dc5c3a0 Parents: 20458c6 ac25081 Author: Nipurn Doshi Authored: Fri Feb 26 15:07:03 2016 -0500 Committer: Nipurn Doshi Committed: Fri Feb 26 15:07:03 2016 -0500 ---------------------------------------------------------------------- .../Model/AppCatalog/ComputeResource/Types.php | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) ----------------------------------------------------------------------