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/a31a848d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a31a848d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a31a848d Branch: refs/heads/cassandra-3.11 Commit: a31a848d6fecf6b365ae1dc789c3991c7c470afb Parents: e9462b9 9b5ba6c Author: AndreÌs de la PenÌa <a.penya.gar...@gmail.com> Authored: Wed Apr 18 11:19:06 2018 +0100 Committer: AndreÌs de la PenÌa <a.penya.gar...@gmail.com> Committed: Wed Apr 18 11:19:06 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 13 +++++++++++++ 2 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a31a848d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7253ec6,0143fc5..da048e7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,5 +1,20 @@@ -3.0.17 +3.11.3 + * 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: + * Add missed CQL keywords to documentation (CASSANDRA-14359) + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 (CASSANDRA-14332) + * Avoid deadlock when running nodetool refresh before node is fully up (CASSANDRA-14310) + * 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) * Respect max hint window when hinting for LWT (CASSANDRA-14215) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a31a848d/doc/cql3/CQL.textile ---------------------------------------------------------------------- diff --cc doc/cql3/CQL.textile index fad69d7,cc2b9aa..f32e30c --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@@ -2299,6 -2155,6 +2299,7 @@@ CQL distinguishes between _reserved_ an | @BOOLEAN@ | no | | @BY@ | yes | | @CALLED@ | no | ++| @CAST@ | no | | @CLUSTERING@ | no | | @COLUMNFAMILY@ | yes | | @COMPACT@ | no | @@@ -2309,12 -2165,12 +2310,14 @@@ | @CUSTOM@ | no | | @DATE@ | no | | @DECIMAL@ | no | ++| @DEFAULT@ | yes | | @DELETE@ | yes | | @DESC@ | yes | | @DESCRIBE@ | yes | | @DISTINCT@ | no | | @DOUBLE@ | no | | @DROP@ | yes | ++| @DURATION@ | no | | @ENTRIES@ | yes | | @EXECUTE@ | yes | | @EXISTS@ | no | @@@ -2327,6 -2183,6 +2330,7 @@@ | @FUNCTION@ | no | | @FUNCTIONS@ | no | | @GRANT@ | yes | ++| @GROUP@ | no | | @IF@ | yes | | @IN@ | yes | | @INDEX@ | yes | @@@ -2343,10 -2200,11 +2348,14 @@@ | @KEYSPACE@ | yes | | @KEYSPACES@ | no | | @LANGUAGE@ | no | ++| @LIKE@ | no | | @LIMIT@ | yes | | @LIST@ | no | | @LOGIN@ | no | | @MAP@ | no | + | @MATERIALIZED@ | yes | ++| @MBEAN@ | yes | ++| @MBEANS@ | yes | | @MODIFY@ | yes | | @NAN@ | yes | | @NOLOGIN@ | no | @@@ -2359,7 -2217,7 +2368,9 @@@ | @OPTIONS@ | no | | @OR@ | yes | | @ORDER@ | yes | ++| @PARTITION@ | no | | @PASSWORD@ | no | ++| @PER@ | no | | @PERMISSION@ | no | | @PERMISSIONS@ | no | | @PRIMARY@ | yes | @@@ -2392,6 -2250,6 +2403,7 @@@ | @TUPLE@ | no | | @TYPE@ | no | | @UNLOGGED@ | yes | ++| @UNSET@ | yes | | @UPDATE@ | yes | | @USE@ | yes | | @USER@ | no | --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
