You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/12/06 03:19:53 UTC
[1/2] cassandra git commit: use parameterized logging
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 6e7a22317 -> 358f9f3fa
use parameterized logging
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9109302
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9109302
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9109302
Branch: refs/heads/cassandra-2.1
Commit: a910930272a4a6443e6c5a2969d5add8b76fe752
Parents: ceed3a2
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Dec 5 21:16:54 2014 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Dec 5 21:16:54 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9109302/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index b5c6c98..0e7e5f2 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1855,14 +1855,14 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
if (sstable == null || !sstable.acquireReference())
{
if (logger.isDebugEnabled())
- logger.debug("using snapshot sstable " + entries.getKey());
+ logger.debug("using snapshot sstable {}", entries.getKey());
sstable = SSTableReader.open(entries.getKey(), entries.getValue(), metadata, partitioner);
// This is technically not necessary since it's a snapshot but makes things easier
sstable.acquireReference();
}
else if (logger.isDebugEnabled())
{
- logger.debug("using active sstable " + entries.getKey());
+ logger.debug("using active sstable {}", entries.getKey());
}
readers.add(sstable);
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/358f9f3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/358f9f3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/358f9f3f
Branch: refs/heads/cassandra-2.1
Commit: 358f9f3faeac155b48fb74dc92b09d303a87c015
Parents: 6e7a223 a910930
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Dec 5 21:18:50 2014 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Dec 5 21:18:50 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/358f9f3f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------