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/559d61af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/559d61af Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/559d61af Branch: refs/heads/cassandra-3.11 Commit: 559d61af6e2f8c6b6779168d86f05646f6cb6bf6 Parents: 31d5d87 4b00601 Author: Aleksey Yeshchenko <alek...@apple.com> Authored: Tue Jul 31 20:28:55 2018 +0100 Committer: Aleksey Yeshchenko <alek...@apple.com> Committed: Tue Jul 31 20:28:55 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ src/java/org/apache/cassandra/config/ColumnDefinition.java | 1 - src/java/org/apache/cassandra/cql3/ColumnIdentifier.java | 5 +++++ src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 4 +--- .../org/apache/cassandra/utils/NativeSSTableLoaderClient.java | 4 +--- 5 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5e39b5e,d2ca759..3557863 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,11 +1,30 @@@ -3.0.18 ++3.11.4 ++Merged from 3.0: + * Fix reading columns with non-UTF names from schema (CASSANDRA-14468) + + -3.0.17 +3.11.3 + * Validate supported column type with SASI analyzer (CASSANDRA-13669) + * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929) + * Reduce nodetool GC thread count (CASSANDRA-14475) + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055) + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416) + * Update metrics to 3.1.5 (CASSANDRA-12924) + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793) + * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271) + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851) + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299) + * 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: * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages (CASSANDRA-14568) * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167) - * Restore resumable hints delivery, backport CASSANDRA-11960 (CASSANDRA-14419) * Always close RT markers returned by ReadCommand#executeLocally() (CASSANDRA-14515) * Reverse order queries with range tombstones can cause data loss (CASSANDRA-14513) * Fix regression of lagging commitlog flush log message (CASSANDRA-14451) http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/src/java/org/apache/cassandra/config/ColumnDefinition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
