[08/13] git commit: Document initial_token/num_tokens behavior when both are set

[br...@apache.org]

Document initial_token/num_tokens behavior when both are set

Patch by Philip Thompson, reviewed by brandonwilliams for CASSANDRA-7411


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

Branch: refs/heads/cassandra-2.1
Commit: ac1d5bd56f5ae96808270358fc45cb19e487e3d8
Parents: 5b878ce
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 26 10:53:24 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 26 10:54:10 2014 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac1d5bd5/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index ef8194e..ea4d955 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -17,7 +17,8 @@ cluster_name: 'Test Cluster'
 # If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility,
 # and will use the initial_token as described below.
 #
-# Specifying initial_token will override this setting.
+# Specifying initial_token will override this setting on the node's initial start,
+# on subsequent starts, this setting will apply even if initial token is set.
 #
 # If you already have a cluster with 1 token per node, and wish to migrate to 
 # multiple tokens per node, see http://wiki.apache.org/cassandra/Operations