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/9c142f91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c142f91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c142f91 Branch: refs/heads/trunk Commit: 9c142f91598bdac122c0d5cc1dee296997084b92 Parents: 521f50b f8acbd2 Author: Benjamin Lerer <[email protected]> Authored: Thu Aug 2 15:20:27 2018 +0200 Committer: Benjamin Lerer <[email protected]> Committed: Thu Aug 2 15:20:59 2018 +0200 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c142f91/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 53babca,ab64ab9..e310589 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -321,7 -56,8 +323,6 @@@ 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) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
