cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [4/10] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 04 May 2012 23:10:28 GMT
Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 7eb22e31a23be8100eb079b75270fbbe36798a0f
Parents: e24681e 885ab7c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri May 4 18:06:52 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri May 4 18:06:52 2012 -0500

----------------------------------------------------------------------
 NEWS.txt                                           |    7 +++++++
 .../cassandra/io/sstable/DescriptorTest.java       |    2 --
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eb22e31/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 7a8b9be,b87f05c..c716834
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -8,23 -8,14 +8,30 @@@ upgrade, just in case you need to roll 
  (Cassandra version X + 1 will always be able to read data files created
  by version X, but the inverse is not necessarily the case.)
  
+ 1.0.10
+ ======
+ 
+ Upgrading
+ ---------
+     - Nothing specific to 1.0.10
+ 
  
 +1.2
 +===
 +
 +Upgrading
 +---------
 +    - The hints schema was changed from 1.1 to 1.2. Cassandra automatically
 +      snapshots and then truncates the hints column family as part of
 +      starting up 1.2 for the first time.  Additionally, upgraded nodes
 +      will not store new hints destined for older (pre-1.2) nodes.
 +    - The `nodetool removetoken` command (and corresponding JMX operation)
 +      have been renamed to `nodetool removenode`.  This function is
 +      incompatible with the earlier `nodetool removetoken`, and attempts to
 +      remove nodes in this way with a mixed 1.1 (or lower) / 1.2 cluster,
 +      is not supported.
 +
 +
  1.1.1
  =====
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eb22e31/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java
----------------------------------------------------------------------


Mime
View raw message