Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af509ec9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af509ec9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af509ec9 Branch: refs/heads/trunk Commit: af509ec9a16f24dedb09ffc13785ea76fcd7217b Parents: 8287ebc f1b9e9a Author: Robert Stupp <sn...@snazy.de> Authored: Sun Dec 27 17:27:21 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Sun Dec 27 17:28:10 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af509ec9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c0fd4f6,41bf6bc..82af7fc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -2.1.13 +2.2.5 + * 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) + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) + * Better handling of SSL connection errors inter-node (CASSANDRA-10816) + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) +Merged from 2.1: + * cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875) * Log error when stream session fails (CASSANDRA-9294) * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593) * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
