Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1BFDE1819A for ; Mon, 1 Feb 2016 17:46:06 +0000 (UTC) Received: (qmail 35153 invoked by uid 500); 1 Feb 2016 17:46:06 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 35097 invoked by uid 500); 1 Feb 2016 17:46:06 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 33936 invoked by uid 99); 1 Feb 2016 17:46:05 -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; Mon, 01 Feb 2016 17:46:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 70AB3E3831; Mon, 1 Feb 2016 17:46:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Mon, 01 Feb 2016 17:46:42 -0000 Message-Id: <03fc656d223a47d0a98f790c7bdaaa38@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [39/50] brooklyn-library git commit: Merge pull request #349 from ahgittin/fix/https-urlmapping-target Merge pull request #349 from ahgittin/fix/https-urlmapping-target get the appropriate http/https port for downstream address in UrlMapping Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/96e4ab4a Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/96e4ab4a Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/96e4ab4a Branch: refs/heads/0.4.0 Commit: 96e4ab4ae7158a961dc3e3289439b90e77dd2d6a Parents: 5c18a34 636afdc Author: Aled Sage Authored: Wed Oct 10 04:30:11 2012 -0700 Committer: Aled Sage Committed: Wed Oct 10 04:30:11 2012 -0700 ---------------------------------------------------------------------- .../entity/proxy/nginx/UrlMapping.groovy | 27 ++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) ----------------------------------------------------------------------