You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/07/16 00:09:06 UTC
[1/3] git commit: invert replace condition
Updated Branches:
refs/heads/cassandra-1.2 d6145668c -> e7061901a
refs/heads/trunk 11928f7d8 -> ae26aab47
invert replace condition
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7061901
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7061901
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7061901
Branch: refs/heads/cassandra-1.2
Commit: e7061901a108a9388f270323d327881fc83098ab
Parents: d614566
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 15 17:08:39 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 15 17:08:39 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7061901/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index e556306..1f7fcdf 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -655,7 +655,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
if (logger.isDebugEnabled())
logger.debug("... got ring + schema info");
- if (DatabaseDescriptor.isReplacing())
+ if (!DatabaseDescriptor.isReplacing())
{
if (tokenMetadata.isMember(FBUtilities.getBroadcastAddress()))
{
[2/3] git commit: invert replace condition
Posted by br...@apache.org.
invert replace condition
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7061901
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7061901
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7061901
Branch: refs/heads/trunk
Commit: e7061901a108a9388f270323d327881fc83098ab
Parents: d614566
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 15 17:08:39 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 15 17:08:39 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7061901/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index e556306..1f7fcdf 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -655,7 +655,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
if (logger.isDebugEnabled())
logger.debug("... got ring + schema info");
- if (DatabaseDescriptor.isReplacing())
+ if (!DatabaseDescriptor.isReplacing())
{
if (tokenMetadata.isMember(FBUtilities.getBroadcastAddress()))
{
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae26aab4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae26aab4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae26aab4
Branch: refs/heads/trunk
Commit: ae26aab47b1351ebab88b0aa5c7f9c473f39a019
Parents: 11928f7 e706190
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jul 15 17:08:45 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jul 15 17:08:45 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae26aab4/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------