You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/04/10 22:54:00 UTC
[1/3] git commit: Fix incorrect logging output
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 8a5b90ede -> 66a6990aa
refs/heads/trunk 333986428 -> 471f5cc34
Fix incorrect logging output
Change in db9bc6929657fac40cf25af94bf919f1b213655a broke logging not to
output number of ranges out of sync.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66a6990a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66a6990a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66a6990a
Branch: refs/heads/cassandra-2.1
Commit: 66a6990aa076bbcdebee952f47c95ccdad735dbc
Parents: 8a5b90e
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Apr 10 15:51:33 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Apr 10 15:51:33 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/repair/Differencer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a6990a/src/java/org/apache/cassandra/repair/Differencer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/Differencer.java b/src/java/org/apache/cassandra/repair/Differencer.java
index 470c1ae..214d2c9 100644
--- a/src/java/org/apache/cassandra/repair/Differencer.java
+++ b/src/java/org/apache/cassandra/repair/Differencer.java
@@ -71,7 +71,7 @@ public class Differencer implements Runnable
}
// non-0 difference: perform streaming repair
- logger.info(format, "have {} range(s) out of sync", differences.size());
+ logger.info(String.format(format, "have " + differences.size() + " range(s) out of sync"));
performStreamingRepair();
}
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/471f5cc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/471f5cc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/471f5cc3
Branch: refs/heads/trunk
Commit: 471f5cc34c99f1f6dc42848446c2739390d7cc7a
Parents: 3339864 66a6990
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Apr 10 15:53:39 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Apr 10 15:53:39 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/repair/Differencer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: Fix incorrect logging output
Posted by yu...@apache.org.
Fix incorrect logging output
Change in db9bc6929657fac40cf25af94bf919f1b213655a broke logging not to
output number of ranges out of sync.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66a6990a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66a6990a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66a6990a
Branch: refs/heads/trunk
Commit: 66a6990aa076bbcdebee952f47c95ccdad735dbc
Parents: 8a5b90e
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Apr 10 15:51:33 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Apr 10 15:51:33 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/repair/Differencer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a6990a/src/java/org/apache/cassandra/repair/Differencer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/Differencer.java b/src/java/org/apache/cassandra/repair/Differencer.java
index 470c1ae..214d2c9 100644
--- a/src/java/org/apache/cassandra/repair/Differencer.java
+++ b/src/java/org/apache/cassandra/repair/Differencer.java
@@ -71,7 +71,7 @@ public class Differencer implements Runnable
}
// non-0 difference: perform streaming repair
- logger.info(format, "have {} range(s) out of sync", differences.size());
+ logger.info(String.format(format, "have " + differences.size() + " range(s) out of sync"));
performStreamingRepair();
}