[1/4] geode git commit: Revert "GEODE-2879: LonerDistributionManager shutdown called from close" [Forced Update!]

2017-05-08 Thread klund 
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-2858 90200aa98 -> 25d02710a (forced update)


Revert "GEODE-2879: LonerDistributionManager shutdown called from close"

This reverts commit 149e06d53a33fa7363da15bf3f9cb248d94fabf5.


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

Branch: refs/heads/feature/GEODE-2858
Commit: 288676dfed0d6d4e0b20e81b2392854fa1204cb6
Parents: 9e089c5
Author: nabarun 
Authored: Fri May 5 16:13:33 2017 -0700
Committer: nabarun 
Committed: Fri May 5 16:13:33 2017 -0700

--
 .../geode/distributed/internal/LonerDistributionManager.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/288676df/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
index d700175..fdb6a13 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
@@ -284,9 +284,7 @@ public class LonerDistributionManager implements DM {
 return null;
   }
 
-  public void close() {
-shutdown();
-  }
+  public void close() {}
 
   public void restartCommunications() {

geode git commit: Revert "GEODE-2879: LonerDistributionManager shutdown called from close"

2017-05-05 Thread nnag 
Repository: geode
Updated Branches:
  refs/heads/develop 9e089c5eb -> 288676dfe


Revert "GEODE-2879: LonerDistributionManager shutdown called from close"

This reverts commit 149e06d53a33fa7363da15bf3f9cb248d94fabf5.


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

Branch: refs/heads/develop
Commit: 288676dfed0d6d4e0b20e81b2392854fa1204cb6
Parents: 9e089c5
Author: nabarun 
Authored: Fri May 5 16:13:33 2017 -0700
Committer: nabarun 
Committed: Fri May 5 16:13:33 2017 -0700

--
 .../geode/distributed/internal/LonerDistributionManager.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/288676df/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
index d700175..fdb6a13 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
@@ -284,9 +284,7 @@ public class LonerDistributionManager implements DM {
 return null;
   }
 
-  public void close() {
-shutdown();
-  }
+  public void close() {}
 
   public void restartCommunications() {