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 821F0193E8 for ; Wed, 30 Mar 2016 19:35:13 +0000 (UTC) Received: (qmail 69074 invoked by uid 500); 30 Mar 2016 19:35:13 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 69029 invoked by uid 500); 30 Mar 2016 19:35:13 -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 68946 invoked by uid 99); 30 Mar 2016 19:35:13 -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 19:35:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 39174E00DB; Wed, 30 Mar 2016 19:35:13 +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: Wed, 30 Mar 2016 19:35:14 -0000 Message-Id: <0fd71e0515dd42a384f16da5bcf0bc2f@git.apache.org> In-Reply-To: <172c04cb29074e3ca9f41eaff88d6652@git.apache.org> References: <172c04cb29074e3ca9f41eaff88d6652@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] airavata-php-gateway git commit: Merge remote-tracking branch 'origin/develop' into develop Merge remote-tracking branch 'origin/develop' 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/e410f776 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e410f776 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e410f776 Branch: refs/heads/develop Commit: e410f776e5ad6690828fe278275732b53e03b27b Parents: 29e1020 58c1d2b Author: scnakandala Authored: Wed Mar 30 15:35:10 2016 -0400 Committer: scnakandala Committed: Wed Mar 30 15:35:10 2016 -0400 ---------------------------------------------------------------------- app/controllers/GatewayprofileController.php | 12 ++++- app/views/admin/manage-gateway.blade.php | 52 ++++++++++++++++++++ .../compute-resource-preferences.blade.php | 10 +++- .../gateway-preferences-block.blade.php | 4 +- .../storage-resource-preferences.blade.php | 21 ++++---- 5 files changed, 83 insertions(+), 16 deletions(-) ----------------------------------------------------------------------