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/8a620464 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a620464 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a620464 Branch: refs/heads/trunk Commit: 8a62046453511661ddc1a506dccf21337ae8242c Parents: 8257154 cc708b9 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Jan 29 16:24:52 2014 -0600 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Jan 29 16:24:52 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 ++ .../db/compaction/AbstractCompactionStrategy.java | 10 +++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a620464/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a620464/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a620464/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ----------------------------------------------------------------------
