Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/025384c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/025384c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/025384c0 Branch: refs/heads/cassandra-3.0 Commit: 025384c065d1cc7c715c048224b9b9bf02ac93ad Parents: f5416e3 f845283 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Jan 5 10:34:45 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Jan 5 10:34:45 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/025384c0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index de5c3ed,bb5909c..bcc4c91 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,7 +1,17 @@@ -2.2.5 +3.0.3 + * Fix counting of received sstables in streaming (CASSANDRA-10949) + * Implement hints compression (CASSANDRA-9428) + * Fix potential assertion error when reading static columns (CASSANDRA-10903) + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711) + * Avoid building PartitionUpdate in toString (CASSANDRA-10897) + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797) + * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873) + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653) + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837) + * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806) +Merged from 2.2: + * drop/alter user should be case sensitive (CASSANDRA-10817) * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) - * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977) * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) * Add new types to Stress (CASSANDRA-9556) * Add property to allow listening on broadcast interface (CASSANDRA-9748) http://git-wip-us.apache.org/repos/asf/cassandra/blob/025384c0/src/java/org/apache/cassandra/cql3/Cql.g ----------------------------------------------------------------------
