You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/18 21:06:01 UTC
[15/16] incubator-geode git commit: GEODE-1493:
config/gemfire.properties that is shipped with the geode distribution
contains user specific info
GEODE-1493: config/gemfire.properties that is shipped with the geode distribution contains user specific info
* Removed user home directory as default cluster-configuration-dir
* Now only IPv4 mcast address is used as default mcast address,
as JGroups can convert IPv4 mcast address to equivalent IPv6.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/832ddd17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/832ddd17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/832ddd17
Branch: refs/heads/feature/GEODE-1565
Commit: 832ddd17b9743417421379b8233fbdc45c1109a6
Parents: f606706
Author: Sai Boorlagadda <sb...@pivotal.io>
Authored: Thu Jun 16 20:16:18 2016 -0700
Committer: Sai Boorlagadda <sb...@pivotal.io>
Committed: Fri Jun 17 17:38:04 2016 -0700
----------------------------------------------------------------------
.../distributed/internal/AbstractDistributionConfig.java | 9 +++------
.../distributed/internal/DistributionConfigImpl.java | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/832ddd17/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index c7eca0f..01c893f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -1148,12 +1148,9 @@ public abstract class AbstractDistributionConfig
}
public static final InetAddress _getDefaultMcastAddress() {
- String ipLiteral;
- if ( SocketCreator.preferIPv6Addresses() ) {
- ipLiteral = "FF38::1234"; // fix for bug 30014
- } else {
- ipLiteral = "239.192.81.1"; // fix for bug 30014
- }
+ //Default MCast address can be just IPv4 address.
+ //On IPv6 machines, JGroups converts IPv4 address to equivalent IPv6 address.
+ String ipLiteral = "239.192.81.1";
try {
return InetAddress.getByName(ipLiteral);
} catch (UnknownHostException ex) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/832ddd17/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index b793e34..d31c739 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -280,7 +280,7 @@ public class DistributionConfigImpl
protected boolean enableSharedConfiguration = DistributionConfig.DEFAULT_ENABLE_CLUSTER_CONFIGURATION;
protected boolean useSharedConfiguration = DistributionConfig.DEFAULT_USE_CLUSTER_CONFIGURATION;
protected boolean loadSharedConfigurationFromDir = DistributionConfig.DEFAULT_LOAD_CLUSTER_CONFIG_FROM_DIR;
- protected String clusterConfigDir = DistributionConfig.DEFAULT_CLUSTER_CONFIGURATION_DIR;
+ protected String clusterConfigDir = "";
private int httpServicePort = DEFAULT_HTTP_SERVICE_PORT;