[10/12] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[jb...@apache.org]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.9
Commit: addf9c2c8e463a147fe6c238373e3b9b70f6fbb4
Parents: 67909ea 023d2e9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:58:13 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:58:13 2016 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/addf9c2c/conf/cassandra.yaml
----------------------------------------------------------------------
diff --cc conf/cassandra.yaml
index d79423e,085b68e..aaabc2b
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -865,16 -762,18 +865,19 @@@ cross_node_timeout: fals
  #   more than one replica on the same "rack" (which may not actually
  #   be a physical location)
  #
- # IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER,
- # YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS
- # ARE PLACED.
- #
- # IF THE RACK A REPLICA IS PLACED IN CHANGES AFTER THE REPLICA HAS BEEN
- # ADDED TO A RING, THE NODE MUST BE DECOMMISSIONED AND REBOOTSTRAPPED.
+ # CASSANDRA WILL NOT ALLOW YOU TO SWITCH TO AN INCOMPATIBLE SNITCH
+ # ONCE DATA IS INSERTED INTO THE CLUSTER.  This would cause data loss.
+ # This means that if you start with the default SimpleSnitch, which
+ # locates every node on "rack1" in "datacenter1", your only options
+ # if you need to add another datacenter are GossipingPropertyFileSnitch
+ # (and the older PFS).  From there, if you want to migrate to an
+ # incompatible snitch like Ec2Snitch you can do it by adding new nodes
+ # under Ec2Snitch (which will locate them in a new "datacenter") and
+ # decommissioning the old ones.
  #
 -# Out of the box, Cassandra provides
 -#  - SimpleSnitch:
 +# Out of the box, Cassandra provides:
 +#
 +# SimpleSnitch:
  #    Treats Strategy order as proximity. This can improve cache
  #    locality when disabling read repair.  Only appropriate for
  #    single-datacenter deployments.