From commits-return-15613-archive-asf-public=cust-asf.ponee.io@pulsar.apache.org Thu Oct 4 14:04:59 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C84FA180677 for ; Thu, 4 Oct 2018 14:04:58 +0200 (CEST) Received: (qmail 47428 invoked by uid 500); 4 Oct 2018 12:04:57 -0000 Mailing-List: contact commits-help@pulsar.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pulsar.apache.org Delivered-To: mailing list commits@pulsar.apache.org Received: (qmail 47419 invoked by uid 99); 4 Oct 2018 12:04:57 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2018 12:04:57 +0000 From: GitBox To: commits@pulsar.apache.org Subject: [GitHub] massakam closed pull request #2713: Added missing brokerServiceURL config keys in proxy.conf Message-ID: <153865469732.32207.16811577992562728032.gitbox@gitbox.apache.org> Date: Thu, 04 Oct 2018 12:04:57 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit massakam closed pull request #2713: Added missing brokerServiceURL config keys in proxy.conf URL: https://github.com/apache/pulsar/pull/2713 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/conf/proxy.conf b/conf/proxy.conf index b95c4d314e..68f0e8dd1d 100644 --- a/conf/proxy.conf +++ b/conf/proxy.conf @@ -23,6 +23,14 @@ zookeeperServers= # Configuration store connection string (as a comma-separated list) configurationStoreServers= +# if Service Discovery is Disabled this url should point to the discovery service provider. +brokerServiceURL= +brokerServiceURLTLS= + +# These settings are unnecessary if `zookeeperServers` is specified +brokerWebServiceURL= +brokerWebServiceURLTLS= + # If function workers are setup in a separate cluster, configure the following 2 settings # to point to the function workers cluster functionWorkerWebServiceURL= ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services