Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geode.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: klund@apache.org
To: commits@geode.incubator.apache.org
Date: Mon, 08 Feb 2016 21:59:13 -0000
Message-Id: <4ec09a4d2aeb4ae6b6dfedd2d097e004@git.apache.org>
In-Reply-To: <7bf1d42154634a4b8465e2af10b8b37f@git.apache.org>
References: <7bf1d42154634a4b8465e2af10b8b37f@git.apache.org>
Subject: [46/50] [abbrv] incubator-geode git commit: GEODE-14: No more
 multicast discovery for peer-to-peer

GEODE-14: No more multicast discovery for peer-to-peer


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/89b0ab2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/89b0ab2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/89b0ab2e

Branch: refs/heads/feature/GEODE-773-2
Commit: 89b0ab2ef1230a4d333af7f06db72239b32b17a1
Parents: c221b2a
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Wed Feb 3 23:53:21 2016 -0800
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Mon Feb 8 07:06:27 2016 -0800

----------------------------------------------------------------------
 .../tcserver/gemfire-p2p/configuration-prompts.properties        | 2 --
 .../release/tcserver/gemfire-p2p/server-fragment.xml             | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/89b0ab2e/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties
index f109d82..fdead44 100644
--- a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties
+++ b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/configuration-prompts.properties
@@ -8,8 +8,6 @@ prefer.deserialized.form=Please specify whether to prefer keeping attributes in
 eviction.heap.percentage=Please enter the percentage of heap at which sessions will be evicted from the local cache. Default '${default}':
 locators=Please enter the list of locators used by GemFire members to discover each other. The format is a comma-separated list of host[port]. Default '${default}':
 log.file=Please enter the name of the file used to log GemFire messages. Default '${default}':
-multicast.discovery.port=Please enter the port used by GemFire members to discover each other using multicast networking. Default '${default}':
-multicast.discovery.address=Please enter the address used by GemFire members to discover each other using multicast networking. Default '${default}':
 rebalance=Please specify whether to rebalance the GemFire cache at startup. Default '${default}':
 region.attributes.id=Please enter the id of the attributes of the GemFire region used to cache sessions. Default '${default}':
 region.name=Please enter the name of the GemFire region used to cache sessions. Default '${default}':

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/89b0ab2e/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml
index d1983c0..cf7dc0d 100644
--- a/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml
+++ b/extensions/gemfire-modules-assembly/release/tcserver/gemfire-p2p/server-fragment.xml
@@ -5,10 +5,8 @@
       cache-xml-file="${cache.configuration.file:cache-peer.xml}"
       criticalHeapPercentage="${critical.heap.percentage:0.0}"
       evictionHeapPercentage="${eviction.heap.percentage:80.0}"
-      locators="${locators: }"
+      locators="${locators:localhost[10334]}"
       log-file="${log.file:gemfire_modules.log}"
-      mcast-port="${multicast.discovery.port:10334}"
-      mcast-address="${multicast.discovery.address:239.192.81.1}"
       rebalance="${rebalance:false}"
       statistic-archive-file="${statistic.archive.file:gemfire_modules.gfs}"
       statistic-sampling-enabled="${statistic.sampling.enabled:false}"/>