You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2018/04/10 13:29:50 UTC
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
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/19e329eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19e329eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19e329eb
Branch: refs/heads/trunk
Commit: 19e329eb5c124d2e37b52052e8622f0515f058b7
Parents: c1020d6 edcb90f
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Apr 10 15:26:30 2018 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Apr 10 15:26:30 2018 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/CorruptSSTableException.java | 4 ++--
.../cassandra/io/sstable/format/SSTableReader.java | 11 +++--------
3 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19e329eb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c4f05d5,94b2276..e0145d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
-3.0.17
+3.11.3
+ * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
+ * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
+ * Serialize empty buffer as empty string for json output format (CASSANDRA-14245)
+ * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396)
+ * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
+ * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170)
+ * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163)
+ * Fix wildcard GROUP BY queries (CASSANDRA-14209)
+Merged from 3.0:
+ * Handle all exceptions when opening sstables (CASSANDRA-14202)
* Handle incompletely written hint descriptors during startup (CASSANDRA-14080)
* Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
* Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19e329eb/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org