You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bd...@apache.org on 2017/11/09 18:11:22 UTC
[1/6] cassandra git commit: Fix SSTableLoader logger message
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 49edd7074 -> f767d35ae
refs/heads/cassandra-3.11 7d6474bb4 -> 387d3a4eb
refs/heads/trunk ec6282242 -> 7707b736c
Fix SSTableLoader logger message
Patch by Jaydeepkumar Chovatia; Reviewed by Blake Eggleston for CASSANDRA-14003
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f767d35a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f767d35a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f767d35a
Branch: refs/heads/cassandra-3.0
Commit: f767d35ae92ccc513684a484a895aeb1a2239734
Parents: 49edd70
Author: jaydeepkumar1984 <ch...@gmail.com>
Authored: Wed Nov 8 16:26:33 2017 -0800
Committer: Blake Eggleston <bd...@gmail.com>
Committed: Thu Nov 9 10:05:56 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f767d35a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a94dbc9..e3026aa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.16
+ * Fix SSTableLoader logger message (CASSANDRA-14003)
* Fix repair race that caused gossip to block (CASSANDRA-13849)
* Tracing interferes with digest requests when using RandomPartitioner (CASSANDRA-13964)
* Add flag to disable materialized views, and warnings on creation (CASSANDRA-13959)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f767d35a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
index 3286522..e597e54 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
@@ -169,7 +169,7 @@ public class SSTableLoader implements StreamEventHandler
return plan.execute();
}
- outputHandler.output(String.format("Streaming relevant part of %sto %s", names(sstables), endpointToRanges.keySet()));
+ outputHandler.output(String.format("Streaming relevant part of %s to %s", names(sstables), endpointToRanges.keySet()));
for (Map.Entry<InetAddress, Collection<Range<Token>>> entry : endpointToRanges.entrySet())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by bd...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7707b736
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7707b736
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7707b736
Branch: refs/heads/trunk
Commit: 7707b736cd216a59f29dccdbabbb8398df95e020
Parents: ec62822 387d3a4
Author: Blake Eggleston <bd...@gmail.com>
Authored: Thu Nov 9 10:08:06 2017 -0800
Committer: Blake Eggleston <bd...@gmail.com>
Committed: Thu Nov 9 10:08:06 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707b736/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707b736/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by bd...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/387d3a4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/387d3a4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/387d3a4e
Branch: refs/heads/cassandra-3.11
Commit: 387d3a4eba9fc1346266a30f27db6e29f049a82e
Parents: 7d6474b f767d35
Author: Blake Eggleston <bd...@gmail.com>
Authored: Thu Nov 9 10:07:53 2017 -0800
Committer: Blake Eggleston <bd...@gmail.com>
Committed: Thu Nov 9 10:07:53 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/387d3a4e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6bd6de8,e3026aa..6a78b60
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.16
+3.11.2
+ * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
+ * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
+ * Update jackson JSON jars (CASSANDRA-13949)
+ * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)
+Merged from 3.0:
+ * Fix SSTableLoader logger message (CASSANDRA-14003)
* Fix repair race that caused gossip to block (CASSANDRA-13849)
* Tracing interferes with digest requests when using RandomPartitioner (CASSANDRA-13964)
* Add flag to disable materialized views, and warnings on creation (CASSANDRA-13959)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/387d3a4e/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Fix SSTableLoader logger message
Posted by bd...@apache.org.
Fix SSTableLoader logger message
Patch by Jaydeepkumar Chovatia; Reviewed by Blake Eggleston for CASSANDRA-14003
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f767d35a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f767d35a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f767d35a
Branch: refs/heads/cassandra-3.11
Commit: f767d35ae92ccc513684a484a895aeb1a2239734
Parents: 49edd70
Author: jaydeepkumar1984 <ch...@gmail.com>
Authored: Wed Nov 8 16:26:33 2017 -0800
Committer: Blake Eggleston <bd...@gmail.com>
Committed: Thu Nov 9 10:05:56 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f767d35a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a94dbc9..e3026aa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.16
+ * Fix SSTableLoader logger message (CASSANDRA-14003)
* Fix repair race that caused gossip to block (CASSANDRA-13849)
* Tracing interferes with digest requests when using RandomPartitioner (CASSANDRA-13964)
* Add flag to disable materialized views, and warnings on creation (CASSANDRA-13959)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f767d35a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
index 3286522..e597e54 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
@@ -169,7 +169,7 @@ public class SSTableLoader implements StreamEventHandler
return plan.execute();
}
- outputHandler.output(String.format("Streaming relevant part of %sto %s", names(sstables), endpointToRanges.keySet()));
+ outputHandler.output(String.format("Streaming relevant part of %s to %s", names(sstables), endpointToRanges.keySet()));
for (Map.Entry<InetAddress, Collection<Range<Token>>> entry : endpointToRanges.entrySet())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by bd...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/387d3a4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/387d3a4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/387d3a4e
Branch: refs/heads/trunk
Commit: 387d3a4eba9fc1346266a30f27db6e29f049a82e
Parents: 7d6474b f767d35
Author: Blake Eggleston <bd...@gmail.com>
Authored: Thu Nov 9 10:07:53 2017 -0800
Committer: Blake Eggleston <bd...@gmail.com>
Committed: Thu Nov 9 10:07:53 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/387d3a4e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6bd6de8,e3026aa..6a78b60
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.16
+3.11.2
+ * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
+ * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
+ * Update jackson JSON jars (CASSANDRA-13949)
+ * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)
+Merged from 3.0:
+ * Fix SSTableLoader logger message (CASSANDRA-14003)
* Fix repair race that caused gossip to block (CASSANDRA-13849)
* Tracing interferes with digest requests when using RandomPartitioner (CASSANDRA-13964)
* Add flag to disable materialized views, and warnings on creation (CASSANDRA-13959)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/387d3a4e/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Fix SSTableLoader logger message
Posted by bd...@apache.org.
Fix SSTableLoader logger message
Patch by Jaydeepkumar Chovatia; Reviewed by Blake Eggleston for CASSANDRA-14003
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f767d35a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f767d35a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f767d35a
Branch: refs/heads/trunk
Commit: f767d35ae92ccc513684a484a895aeb1a2239734
Parents: 49edd70
Author: jaydeepkumar1984 <ch...@gmail.com>
Authored: Wed Nov 8 16:26:33 2017 -0800
Committer: Blake Eggleston <bd...@gmail.com>
Committed: Thu Nov 9 10:05:56 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f767d35a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a94dbc9..e3026aa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.16
+ * Fix SSTableLoader logger message (CASSANDRA-14003)
* Fix repair race that caused gossip to block (CASSANDRA-13849)
* Tracing interferes with digest requests when using RandomPartitioner (CASSANDRA-13964)
* Add flag to disable materialized views, and warnings on creation (CASSANDRA-13959)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f767d35a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
index 3286522..e597e54 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
@@ -169,7 +169,7 @@ public class SSTableLoader implements StreamEventHandler
return plan.execute();
}
- outputHandler.output(String.format("Streaming relevant part of %sto %s", names(sstables), endpointToRanges.keySet()));
+ outputHandler.output(String.format("Streaming relevant part of %s to %s", names(sstables), endpointToRanges.keySet()));
for (Map.Entry<InetAddress, Collection<Range<Token>>> entry : endpointToRanges.entrySet())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org