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/3b56d4df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b56d4df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b56d4df Branch: refs/heads/trunk Commit: 3b56d4df40800f76dcf2c0019af43b7dbc244c57 Parents: bdb5280 f0403b4 Author: Mick Semb Wever <[email protected]> Authored: Thu Jun 14 09:33:41 2018 +1000 Committer: Mick Semb Wever <[email protected]> Committed: Thu Jun 14 09:36:28 2018 +1000 ---------------------------------------------------------------------- CHANGES.txt | 1 - src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b56d4df/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 49738cd,083f480..24aaabb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -293,7 -45,7 +293,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: - * CqlRecordReader no longer quotes the keyspace when connecting, as the java driver will (CASSANDRA-10751) - * 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]
