Merge branch 'cassandra-1.1' into trunk
Conflicts:
NEWS.txt
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29124f6a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29124f6a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29124f6a
Branch: refs/heads/trunk
Commit: 29124f6a88a42722fbcfeba7466bf8b2f92ad478
Parents: ce807c6 b94d8d4
Author: Sylvain Lebresne <[email protected]>
Authored: Fri Jun 29 18:33:31 2012 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Fri Jun 29 18:33:31 2012 +0200
----------------------------------------------------------------------
.rat-excludes | 1 +
CHANGES.txt | 4 ++++
NEWS.txt | 13 +++++++++++++
debian/changelog | 6 ++++++
.../Keyspace1-Standard3-hd-1-Data.db | Bin 0 -> 498 bytes
.../Keyspace1-Standard3-hd-1-Filter.db | Bin 0 -> 256 bytes
.../Keyspace1-Standard3-hd-1-Index.db | Bin 0 -> 66 bytes
.../Keyspace1-Standard3-hd-1-Statistics.db | Bin 0 -> 4354 bytes
8 files changed, 24 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29124f6a/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29124f6a/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 23814b1,fd7be27..ca16ed2
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -9,39 -9,19 +9,52 @@@ upgrade, just in case you need to roll
by version X, but the inverse is not necessarily the case.)
+1.2
+===
+Upgrading
+---------
+ - 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.
+ - The somewhat ill-concieved CollatingOrderPreservingPartitioner
+ has been removed. Use RandomPartitioner (recommended) or
+ ByteOrderedPartitioner instead.
+ - Global option hinted_handoff_throttle_delay_in_ms has been removed.
+ hinted_handoff_throttle_in_kb has been added instead.
+
+Features
+--------
+ - rpc_timeout has been split up to allow finer-grained control
+ on timeouts for different operation types
+
+
+ 1.1.2
+ =====
+
+ Upgrading
+ ---------
+ - Nothing specific to this release, but please see 1.1 if you are
upgrading
+ from a previous version.
+
+ Features
+ --------
+ - cqlsh has a new COPY command to load data from CSV flat files
+
+
1.1.1
=====
