Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: NEWS.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a15d57b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a15d57b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a15d57b7 Branch: refs/heads/cassandra-2.0 Commit: a15d57b7d068dc1b3e5b024f26afb28a3905f08e Parents: 20d91b0 bcb9edc Author: Jason Brown <jasedbr...@gmail.com> Authored: Thu Oct 17 14:18:35 2013 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Thu Oct 17 14:18:35 2013 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a15d57b7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index aa7ad66,0435d4e..ad38cd3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,7 +1,31 @@@ -1.2.12 +2.0.2 + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) +Merged from 1.2: * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty + * Add a LOCAL_ONE consistency level (CASSANDRA-6202) 1.2.11 http://git-wip-us.apache.org/repos/asf/cassandra/blob/a15d57b7/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index da52382,000986f..3fa0c8d --- a/NEWS.txt +++ b/NEWS.txt @@@ -14,22 -14,15 +14,24 @@@ restore snapshots created with the prev using the provided 'sstableupgrade' tool. -1.2.12 -====== -Features --------- +2.0.2 +===== + +New features +------------ + - Speculative retry defaults to 99th percentile + (See blog post at http://www.datastax.com/dev/blog/rapid-read-protection-in-cassandra-2-0-2) + - Configurable metrics reporting + (see conf/metrics-reporter-config-sample.yaml) + - 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 + execute only in the local datacenter. -1.2.11 -====== + +2.0.1 +===== Upgrading ---------