merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58014d30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58014d30 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58014d30 Branch: refs/heads/cassandra-2.0 Commit: 58014d3038621a9bd732724d226b377917fd62e7 Parents: 74d63ba 232906d Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Oct 20 02:08:52 2013 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Oct 20 02:08:52 2013 +0100 ---------------------------------------------------------------------- NEWS.txt | 12 +++++++++++- .../io/compress/CompressedSequentialWriter.java | 12 ++++++++++++ .../org/apache/cassandra/service/StorageService.java | 12 ++++++------ 3 files changed, 29 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/58014d30/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index 7bd0d63,9d90ea7..69ab4fd --- a/NEWS.txt +++ b/NEWS.txt @@@ -26,12 -26,6 +26,12 @@@ New feature - Compaction history and stats are now saved to system keyspace (system.compaction_history table). You can access historiy via new 'nodetool compactionhistory' command or CQL. - - Added a new consistenct level, LOCAL_ONE, that forces all CL.ONE operations to ++ - Added a new consistency level, LOCAL_ONE, that forces all CL.ONE operations to + execute only in the local datacenter. + - New replace_address to supplant the (now removed) replace_token and + replace_node workflows to replace a dead node in place. Works like the + old options, but takes the IP address of the node to be replaced. + 2.0.1 =====
