Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cff47b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cff47b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cff47b9 Branch: refs/heads/trunk Commit: 0cff47b923dc99ae23753c06fbd0a470d81f6753 Parents: e9cfc64 65773b1 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Sep 30 01:29:58 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Sep 30 01:29:58 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 36 ++++++++------------ .../org/apache/cassandra/db/DataTracker.java | 14 +++++--- .../org/apache/cassandra/db/MeteredFlusher.java | 18 +++++----- .../compaction/AbstractCompactionStrategy.java | 30 ++++++++++++++++ .../MemtableRenewedNotification.java | 30 ++++++++++++++++ 6 files changed, 95 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cff47b9/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cff47b9/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
