Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/574468cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/574468cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/574468cb Branch: refs/heads/trunk Commit: 574468cbad3b5556eb12b52a6941dbd36bf9f8d4 Parents: 471f5cc 930905b Author: Yuki Morishita <yu...@apache.org> Authored: Fri Apr 11 10:57:45 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Apr 11 10:57:45 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 35 ++++++++++++++------ .../db/compaction/CompactionManager.java | 7 +--- .../cassandra/io/sstable/SSTableReader.java | 10 ++++-- 4 files changed, 35 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574468cb/CHANGES.txt ----------------------------------------------------------------------
