cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdeggles...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Thu, 09 Nov 2017 18:11:25 GMT
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 <bdeggleston@gmail.com>
Authored: Thu Nov 9 10:07:53 2017 -0800
Committer: Blake Eggleston <bdeggleston@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


Mime
View raw message