You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/02 19:19:06 UTC
[3/6] git commit: merge from 1.2
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa2936a8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa2936a8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa2936a8
Branch: refs/heads/trunk
Commit: aa2936a89c9ad2047a3632b8dd6775e6e8c984d0
Parents: be8c9ab a117243
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 2 00:00:56 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 2 00:00:56 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa2936a8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 5b00656,0000deb..7b11672
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -250,8 -223,7 +250,7 @@@ public class ColumnFamilyStore implemen
Caching caching = metadata.getCaching();
- if (logger.isDebugEnabled())
- logger.debug("Starting CFS {}", name);
- logger.info("Initializing {}.{}", table.name, columnFamily);
++ logger.info("Initializing {}.{}", keyspace.getName(), name);
// scan for sstables corresponding to this cf and load them
data = new DataTracker(this);