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 C4C9D200C7F for ; Wed, 24 May 2017 23:34:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C398C160BE2; Wed, 24 May 2017 21:34:16 +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 49256160BE0 for ; Wed, 24 May 2017 23:34:15 +0200 (CEST) Received: (qmail 89869 invoked by uid 500); 24 May 2017 21:34:14 -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 87891 invoked by uid 99); 24 May 2017 21:34:12 -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, 24 May 2017 21:34:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5186FF49D6; Wed, 24 May 2017 21:34:12 +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, 24 May 2017 21:34:33 -0000 Message-Id: In-Reply-To: <0c70da5d11144474a0b0d30c186b3100@git.apache.org> References: <0c70da5d11144474a0b0d30c186b3100@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/61] [abbrv] airavata git commit: Merge remote-tracking branch 'origin/develop' into develop archived-at: Wed, 24 May 2017 21:34:17 -0000 Merge remote-tracking branch 'origin/develop' into develop Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4b0a9ecb Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4b0a9ecb Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4b0a9ecb Branch: refs/heads/master Commit: 4b0a9ecb9ccf34757602dd2d7c7f1156ec4aeac7 Parents: e6eb0c9 b5984b0 Author: scnakandala Authored: Tue May 2 16:43:47 2017 -0400 Committer: scnakandala Committed: Tue May 2 16:43:47 2017 -0400 ---------------------------------------------------------------------- .../roles/api-orch/templates/airavata-server.properties.j2 | 2 +- modules/distribution/pom.xml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) ----------------------------------------------------------------------