You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2016/07/26 15:58:29 UTC
[01/12] cassandra git commit: update cassandra.yaml comments
post-CASSANDRA-10243
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3d3359eb9 -> 48a45eda5
refs/heads/cassandra-2.2 b92ab60f7 -> 04ef62cba
refs/heads/cassandra-3.9 67909ea84 -> addf9c2c8
refs/heads/trunk accf7a472 -> 1eede6e38
update cassandra.yaml comments post-CASSANDRA-10243
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48a45eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48a45eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48a45eda
Branch: refs/heads/cassandra-2.1
Commit: 48a45eda50c7a8fc0e118dc4d14a3daf82146c08
Parents: 3d3359e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:31 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:31 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a45eda/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 7f2a6fa..db4cd37 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -656,12 +656,15 @@ cross_node_timeout: false
# 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:
[09/12] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/023d2e98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/023d2e98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/023d2e98
Branch: refs/heads/cassandra-3.9
Commit: 023d2e98f1a49221c773f2c1c6fb533d6bcc059a
Parents: 0bb133e 04ef62c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:55 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:55 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/023d2e98/conf/cassandra.yaml
----------------------------------------------------------------------
[04/12] cassandra git commit: update cassandra.yaml comments
post-CASSANDRA-10243
Posted by jb...@apache.org.
update cassandra.yaml comments post-CASSANDRA-10243
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48a45eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48a45eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48a45eda
Branch: refs/heads/trunk
Commit: 48a45eda50c7a8fc0e118dc4d14a3daf82146c08
Parents: 3d3359e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:31 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:31 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a45eda/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 7f2a6fa..db4cd37 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -656,12 +656,15 @@ cross_node_timeout: false
# 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:
[08/12] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/023d2e98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/023d2e98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/023d2e98
Branch: refs/heads/trunk
Commit: 023d2e98f1a49221c773f2c1c6fb533d6bcc059a
Parents: 0bb133e 04ef62c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:55 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:55 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/023d2e98/conf/cassandra.yaml
----------------------------------------------------------------------
[10/12] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by 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.
[02/12] cassandra git commit: update cassandra.yaml comments
post-CASSANDRA-10243
Posted by jb...@apache.org.
update cassandra.yaml comments post-CASSANDRA-10243
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48a45eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48a45eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48a45eda
Branch: refs/heads/cassandra-2.2
Commit: 48a45eda50c7a8fc0e118dc4d14a3daf82146c08
Parents: 3d3359e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:31 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:31 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a45eda/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 7f2a6fa..db4cd37 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -656,12 +656,15 @@ cross_node_timeout: false
# 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:
[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04ef62cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ef62cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04ef62cb
Branch: refs/heads/trunk
Commit: 04ef62cba2a8f19f4e853ceb403f9b9e9e426853
Parents: b92ab60 48a45ed
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:43 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:43 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04ef62cb/conf/cassandra.yaml
----------------------------------------------------------------------
[06/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04ef62cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ef62cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04ef62cb
Branch: refs/heads/cassandra-2.2
Commit: 04ef62cba2a8f19f4e853ceb403f9b9e9e426853
Parents: b92ab60 48a45ed
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:43 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:43 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04ef62cb/conf/cassandra.yaml
----------------------------------------------------------------------
[11/12] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by 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/trunk
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.
[03/12] cassandra git commit: update cassandra.yaml comments
post-CASSANDRA-10243
Posted by jb...@apache.org.
update cassandra.yaml comments post-CASSANDRA-10243
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48a45eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48a45eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48a45eda
Branch: refs/heads/cassandra-3.9
Commit: 48a45eda50c7a8fc0e118dc4d14a3daf82146c08
Parents: 3d3359e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:31 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:31 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/48a45eda/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 7f2a6fa..db4cd37 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -656,12 +656,15 @@ cross_node_timeout: false
# 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:
[12/12] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1eede6e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eede6e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1eede6e3
Branch: refs/heads/trunk
Commit: 1eede6e3819088e09a859dbf90a0d26bd807de2a
Parents: accf7a4 addf9c2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:58:21 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:58:21 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[05/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04ef62cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ef62cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04ef62cb
Branch: refs/heads/cassandra-3.9
Commit: 04ef62cba2a8f19f4e853ceb403f9b9e9e426853
Parents: b92ab60 48a45ed
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:43 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:43 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04ef62cb/conf/cassandra.yaml
----------------------------------------------------------------------