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/521f50bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/521f50bb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/521f50bb Branch: refs/heads/trunk Commit: 521f50bb120064d866e93a86cb0c90c1a7ae0307 Parents: 62423f6 975e1d3 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Aug 2 11:33:21 2018 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Aug 2 11:33:21 2018 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/marshal/DoubleType.java | 6 +++++- src/java/org/apache/cassandra/db/marshal/FloatType.java | 6 +++++- .../cassandra/cql3/validation/entities/JsonTest.java | 11 +++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/521f50bb/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fb9b7c4,b50d27e..53babca --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -321,6 -54,9 +321,7 @@@ Merged from 3.0 * Fully utilise specified compaction threads (CASSANDRA-14210) * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763) Merged from 2.2: + * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377) - * Fix bug that prevented compaction of SSTables after full repairs (CASSANDRA-14423) - * Incorrect counting of pending messages in OutboundTcpConnection (CASSANDRA-11551) * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743) * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411) * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286) http://git-wip-us.apache.org/repos/asf/cassandra/blob/521f50bb/src/java/org/apache/cassandra/db/marshal/DoubleType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/521f50bb/src/java/org/apache/cassandra/db/marshal/FloatType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/521f50bb/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
