Updated Branches: refs/heads/trunk c5649e072 -> 0e85cce2d
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e85cce2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e85cce2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e85cce2 Branch: refs/heads/trunk Commit: 0e85cce2d27c8d04dbf164d667c07b8c1ff2f0de Parents: c5649e0 aa40860 Author: Pavel Yaskevich <xe...@apache.org> Authored: Fri Mar 16 14:02:01 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Fri Mar 16 14:02:01 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 25 ++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e85cce2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e85cce2/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e85cce2/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 0aa45a5,bea3643..2bb4e18 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -70,9 -71,11 +70,11 @@@ import org.apache.cassandra.utils.* import org.apache.cassandra.utils.IntervalTree.Interval; import org.cliffc.high_scale_lib.NonBlockingHashMap; + import static org.apache.cassandra.config.CFMetaData.Caching; + public class ColumnFamilyStore implements ColumnFamilyStoreMBean { - private static Logger logger = LoggerFactory.getLogger(ColumnFamilyStore.class); + private static final Logger logger = LoggerFactory.getLogger(ColumnFamilyStore.class); /* * maybeSwitchMemtable puts Memtable.getSortedContents on the writer executor. When the write is complete,
