Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 606CB200D0F for ; Fri, 29 Sep 2017 22:42:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5F1671609BC; Fri, 29 Sep 2017 20:42:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 867F61609EE for ; Fri, 29 Sep 2017 22:42:35 +0200 (CEST) Received: (qmail 86355 invoked by uid 500); 29 Sep 2017 20:42:34 -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 86330 invoked by uid 99); 29 Sep 2017 20:42:34 -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, 29 Sep 2017 20:42:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E8D6F5C0C; Fri, 29 Sep 2017 20:42:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: machristie@apache.org To: commits@airavata.apache.org Date: Fri, 29 Sep 2017 20:42:37 -0000 Message-Id: <8bc4ff159c8c4ac8a274b8675591a698@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] airavata-php-gateway git commit: Merge branch 'AIRAVATA-2520-bugfix' into develop archived-at: Fri, 29 Sep 2017 20:42:36 -0000 Merge branch 'AIRAVATA-2520-bugfix' 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/4adeaa7e Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/4adeaa7e Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/4adeaa7e Branch: refs/heads/develop Commit: 4adeaa7e0202e725f769cf7498770a1cd7fc0db4 Parents: 5a4a9c3 07d3255 Author: Marcus Christie Authored: Fri Sep 29 16:42:22 2017 -0400 Committer: Marcus Christie Committed: Fri Sep 29 16:42:22 2017 -0400 ---------------------------------------------------------------------- app/config/pga_config.php.template | 2 +- app/views/experiment/edit.blade.php | 1 - .../partials/experiment-queue-block.blade.php | 69 +++++++++++++++++++- 3 files changed, 67 insertions(+), 5 deletions(-) ----------------------------------------------------------------------