merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2042bc3c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2042bc3c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2042bc3c Branch: refs/heads/trunk Commit: 2042bc3ca9332fabe1069ce741969eec5bfb3d6d Parents: 2ddf2cd f065cbf Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Nov 29 13:26:43 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Nov 29 13:26:43 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/repair/RepairSession.java | 10 ++-- .../cassandra/service/ActiveRepairService.java | 27 +++++++--- .../cassandra/service/StorageService.java | 54 ++++++++++++++++++-- .../cassandra/service/StorageServiceMBean.java | 17 ++++++ .../org/apache/cassandra/tools/NodeCmd.java | 12 ++++- .../org/apache/cassandra/tools/NodeProbe.java | 16 +++--- .../apache/cassandra/tools/NodeToolHelp.yaml | 4 ++ .../service/AntiEntropyServiceTestAbstract.java | 8 +-- 9 files changed, 120 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8d11a0a,12469f2..81ba65a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,8 +1,26 @@@ +2.1 + * allocate fixed index summary memory pool and resample cold index summaries + to use less memory (CASSANDRA-5519) + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + + 2.0.4 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218) + * Fix divide-by-zero in PCI (CASSANDRA-6403) * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395) + * Add snapshot space used to cfstats (CASSANDRA-6231) * Expose a total memtable size metric for a CF (CASSANDRA-6391) Merged from 1.2: * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/src/java/org/apache/cassandra/repair/RepairSession.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
