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 2015/12/13 00:20:55 UTC
[1/2] cassandra git commit: fix minor parameterized logging typo
Repository: cassandra
Updated Branches:
refs/heads/trunk f7666d5f2 -> 779817fe7
fix minor parameterized logging typo
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8b9e533
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8b9e533
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8b9e533
Branch: refs/heads/trunk
Commit: a8b9e533fd4c394111d506b94fbda28759a2604b
Parents: c0d47be
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat Dec 12 18:16:27 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat Dec 12 18:16:27 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8b9e533/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 397b8b9..f8ed61d 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -723,7 +723,7 @@ public class StorageProxy implements StorageProxyMBean
//if there are no paired endpoints there are probably range movements going on,
//so we write to the local batchlog to replay later
if (pendingEndpoints.isEmpty())
- logger.warn("Received base materialized view mutation for key %s that does not belong " +
+ logger.warn("Received base materialized view mutation for key {} that does not belong " +
"to this node. There is probably a range movement happening (move or decommission)," +
"but this node hasn't updated its ring metadata yet. Adding mutation to " +
"local batchlog to be replayed later.",
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-3.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/779817fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/779817fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/779817fe
Branch: refs/heads/trunk
Commit: 779817fe71c1d0a891b414df8194d3350089044a
Parents: f7666d5 a8b9e53
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat Dec 12 18:20:40 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat Dec 12 18:20:40 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/779817fe/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------