Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87b39c8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87b39c8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87b39c8a Branch: refs/heads/trunk Commit: 87b39c8af3477c3b80f124da23b46de350a259e7 Parents: dbd1a72 4fd322f Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Nov 22 13:23:04 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Nov 22 13:23:04 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- .../org/apache/cassandra/service/StorageService.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87b39c8a/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87b39c8a/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 5dabb42,e91ac8c..2dc7ad8 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -3046,10 -3046,10 +3046,10 @@@ public class StorageService extends Not // A leaving endpoint that is dead is already being removed. if (tokenMetadata.isLeaving(endpoint)) - logger.warn("Node " + endpoint + " is already being removed, continuing removal anyway"); + logger.warn("Node {} is already being removed, continuing removal anyway", endpoint); if (!replicatingNodes.isEmpty()) - throw new UnsupportedOperationException("This node is already processing a removal. Wait for it to complete, or use 'removetoken force' if this has failed."); + throw new UnsupportedOperationException("This node is already processing a removal. Wait for it to complete, or use 'removenode force' if this has failed."); // Find the endpoints that are going to become responsible for data for (String keyspaceName : Schema.instance.getNonSystemKeyspaces())
