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/22c97bc5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22c97bc5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22c97bc5 Branch: refs/heads/trunk Commit: 22c97bc5ef5017663a40d25bd5b7283c09e25dd5 Parents: f74419c 2d462c0 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jul 17 15:36:49 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jul 17 15:36:49 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/22c97bc5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e6c093d,c6774c2..9a262dc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,14 +1,17 @@@ -2.1.9 +2.2.0-rc3 + * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671) + * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771) +Merged from 2.1: * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837) - * Complete CASSANDRA-8448 fix (CASSANDRA-9519) * Handle corrupt files on startup (CASSANDRA-9686) * Fix clientutil jar and tests (CASSANDRA-9760) * (cqlsh) Allow the SSL protocol version to be specified through the config file or environment variables (CASSANDRA-9544) Merged from 2.0: + * Complete CASSANDRA-8448 fix (CASSANDRA-9519) * Don't include auth credentials in debug log (CASSANDRA-9682) * Can't transition from write survey to normal mode (CASSANDRA-9740) - * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591) + * Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591) * Fix growing pending background compaction (CASSANDRA-9662)
