You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2012/07/17 19:33:04 UTC

[34/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4122/02_remove_tokens' into refs/top-bases/p/4122/02_remove_tokens

Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4122/02_remove_tokens' into refs/top-bases/p/4122/02_remove_tokens


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

Branch: refs/heads/vnodes
Commit: 02f4bc47f7c165621604cf4d0123a53fb0f1628b
Parents: c752681 021748c
Author: Eric Evans <ee...@apache.org>
Authored: Sat Jul 14 12:37:21 2012 -0600
Committer: Eric Evans <ee...@apache.org>
Committed: Sat Jul 14 12:37:21 2012 -0600

----------------------------------------------------------------------
 NEWS.txt |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02f4bc47/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index fd13667,2b470d1..c52bd89
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -41,10 -41,11 +41,13 @@@ Upgradin
  
  Features
  --------
 +    - Cassandra can now handle concurrent CREATE TABLE schema changes
 +      as well as other updates
      - rpc_timeout has been split up to allow finer-grained control
        on timeouts for different operation types
+     - num_tokens can now be specified in cassandra.yaml. This defines the
+       number of tokens assigned to the host on the ring (default: 1).
+       Also specifying initial_token will override any num_tokens setting.
  
  
  1.1.2