cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Date Mon, 03 Nov 2014 17:00:59 GMT
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/632ebc5c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/632ebc5c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/632ebc5c

Branch: refs/heads/trunk
Commit: 632ebc5c57e10b1fcf8b4b1ab31368202e851c0c
Parents: 0f59629 623aa6f
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Mon Nov 3 11:00:06 2014 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Mon Nov 3 11:00:44 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                               |  1 +
 src/java/org/apache/cassandra/service/StorageService.java | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/632ebc5c/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/632ebc5c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index ea21f3d,84a6c14..1cbf2b7
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1610,9 -1659,21 +1610,14 @@@ public class StorageService extends Not
          if (tokenMetadata.isMoving(endpoint)) // if endpoint was moving to a new token
          {
              tokenMetadata.removeFromMoving(endpoint);
 -
 -            if (!isClientMode)
 -            {
 -                for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
 -                    subscriber.onMove(endpoint);
 -            }
 +            for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
 +                subscriber.onMove(endpoint);
          }
+         else
+         {
 -            if (!isClientMode)
 -            {
 -                for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
 -                    subscriber.onJoinCluster(endpoint);
 -            }
++            for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
++                subscriber.onJoinCluster(endpoint);
+         }
  
          PendingRangeCalculatorService.instance.update();
      }


Mime
View raw message