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/bb95c1dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb95c1dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb95c1dd Branch: refs/heads/trunk Commit: bb95c1dd01adc21c357a1803579a40b34a181a98 Parents: 1fe9a11 c0ba85a Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Nov 2 09:10:46 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat Nov 2 09:10:46 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/config/CFMetaData.java | 3 ++- src/java/org/apache/cassandra/db/Memtable.java | 2 +- src/java/org/apache/cassandra/db/SystemKeyspace.java | 1 - src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 2 +- src/java/org/apache/cassandra/repair/Validator.java | 4 ++-- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- src/java/org/apache/cassandra/utils/EstimatedHistogram.java | 1 - 8 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb95c1dd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ad05970,70d295b..e55c8f7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +2.1 + * 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) + 2.0.3 + * Avoid flushing compaction_history after each operation (CASSANDRA-6287) * Fix repair assertion error when tombstones expire (CASSANDRA-6277) * Skip loading corrupt key cache (CASSANDRA-6260) * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb95c1dd/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb95c1dd/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb95c1dd/src/java/org/apache/cassandra/db/SystemKeyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb95c1dd/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb95c1dd/src/java/org/apache/cassandra/repair/Validator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb95c1dd/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 82c9d51,77a7e5a..e665df1 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -789,10 -792,10 +789,10 @@@ public class StorageService extends Not } tokens.add(midpoint); } - logger.info("Split previous range (" + left + ", " + right + "] into " + tokens); + logger.info("Split previous range ({}, {}] into {}", left, right, tokens); } else - logger.info("Using saved token {}", tokens); - logger.info("Using saved tokens " + tokens); ++ logger.info("Using saved tokens {}", tokens); } }
