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 D1B69180B2 for ; Tue, 16 Feb 2016 16:40:23 +0000 (UTC) Received: (qmail 80043 invoked by uid 500); 16 Feb 2016 16:40:23 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 79998 invoked by uid 500); 16 Feb 2016 16:40:23 -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 79833 invoked by uid 99); 16 Feb 2016 16:40:23 -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, 16 Feb 2016 16:40:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 34BEEDFE60; Tue, 16 Feb 2016 16:40:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ndoshi@apache.org To: commits@airavata.apache.org Date: Tue, 16 Feb 2016 16:40:24 -0000 Message-Id: <66c9fdbba68e4319830d5b754a6d7ba3@git.apache.org> In-Reply-To: <4523b0a47221423e86acd00d14615e1a@git.apache.org> References: <4523b0a47221423e86acd00d14615e1a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] airavata-php-gateway git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' 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/69dcdd1a Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/69dcdd1a Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/69dcdd1a Branch: refs/heads/develop Commit: 69dcdd1a11ba3421e84e97a3a0896ab80de62898 Parents: 3c3d565 bac3b46 Author: scnakandala Authored: Mon Feb 15 10:37:44 2016 -0500 Committer: scnakandala Committed: Mon Feb 15 10:37:44 2016 -0500 ---------------------------------------------------------------------- app/controllers/ComputeResourceController.php | 2 +- app/controllers/StorageResourceController.php | 19 +- app/libraries/Airavata/API/Airavata.php | 2515 +++++++++++++------- app/libraries/Airavata/Model/Types.php | 885 ++++++- app/libraries/CRUtilities.php | 2 +- app/libraries/SRUtilities.php | 21 +- app/views/resource/edit.blade.php | 39 +- app/views/storage-resource/browse.blade.php | 2 +- 8 files changed, 2500 insertions(+), 985 deletions(-) ----------------------------------------------------------------------