Updated Branches:
  refs/heads/cassandra-1.1 a7277178a -> 1bfb68518
  refs/heads/trunk 782b1561f -> 2155250fd


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 2155250fd8b5643b7a838db7d8f83793a549473a
Parents: 9383aeb 1bfb685
Author: Jonathan Ellis <jbel...@apache.org>
Authored: Fri May 25 15:52:23 2012 -0500
Committer: Jonathan Ellis <jbel...@apache.org>
Committed: Fri May 25 15:52:23 2012 -0500

----------------------------------------------------------------------
 NEWS.txt |   29 ++++++++++-------------------
 1 files changed, 10 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2155250f/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 73ec79b,3a4f222..3445d3f
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -9,27 -9,6 +9,29 @@@ upgrade, just in case you need to roll 
  by version X, but the inverse is not necessarily the case.)
  
  
 +1.2
 +===
- 
 +Upgrading
 +---------
-     - Network compatibility for versions older than 1.0 has been removed.
-       (Disk compatibility is retained.)  If you want to do node-at-a-time,
-       zero-downtime upgrades to 1.2, you must be on 1.0 or 1.1 first.
++    - 1.2 is NOT network-compatible with versions older than 1.0.  That
++      means if you want to do a rolling, zero-downtime upgrade, you'll need
++      to upgrade first to 1.0.x or 1.1.x, and then to 1.2.  1.2 retains
++      the ability to read data files from Cassandra versions at least
++      back to 0.6, so a non-rolling upgrade remains possible with just
++      one step.
 +    - 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.  It is
 +      therefore recommended that you perform a cluster upgrade when all
 +      nodes are up.
 +    - 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
  =====
  

Reply via email to