Merge branch 'cassandra-2.1' into cassandra-2.2

NEWS.txt

@@ -24,8 +24,8 @@ Deprecation
 Operations
 ----------
     - Switching racks is no longer an allowed operation on a node which has
-      data. Instead, the node will need to be wiped and bootstrapped. If
-      moving from the SimpleSnitch, make sure the rack containing all current
+      data. Instead, the node will need to be decommissioned and rebootstrapped.
+      If moving from the SimpleSnitch, make sure the rack containing all current
       nodes is named "rack1".
 
 

conf/cassandra.yaml

@@ -701,7 +701,7 @@ cross_node_timeout: false
 # ARE PLACED.
 #
 # IF THE RACK A REPLICA IS PLACED IN CHANGES AFTER THE REPLICA HAS BEEN
-# ADDED TO A RING, THE NODE MUST BE WIPED AND REBOOTSTRAPPED.
+# ADDED TO A RING, THE NODE MUST BE DECOMMISSIONED AND REBOOTSTRAPPED.
 #
 # Out of the box, Cassandra provides
 #  - SimpleSnitch:

src/java/org/apache/cassandra/service/CassandraDaemon.java

@@ -239,7 +239,7 @@ public class CassandraDaemon
             if (!storedRack.equals(currentRack))
             {
                 logger.error("Cannot start node if snitch's rack differs from previous rack. " +
-                             "Please fix the snitch or wipe and rebootstrap this node.");
+                             "Please fix the snitch or decommission and rebootstrap this node.");
                 System.exit(100);
             }
         }