merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e667993b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e667993b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e667993b Branch: refs/heads/trunk Commit: e667993b9608915d996eeb269791ca49e92b6e0f Parents: b204803 447d605 Author: Jonathan Ellis <[email protected]> Authored: Mon Aug 24 19:59:57 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Aug 24 19:59:57 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e667993b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 30f7d30,45e59f7..28fe8a2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,19 @@@ -2.1.9 +2.2.1 + * add CLEAR cqlsh command (CASSANDRA-10086) + * Support string literals as Role names for compatibility (CASSANDRA-10135) + * Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114) + * An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043) + * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749) + * Fix histogram overflow exception (CASSANDRA-9973) + * Route gossip messages over dedicated socket (CASSANDRA-9237) + * Add checksum to saved cache files (CASSANDRA-9265) + * Log warning when using an aggregate without partition key (CASSANDRA-9737) + * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900) + * UDF / UDA execution time in trace (CASSANDRA-9723) + * Fix broken internode SSL (CASSANDRA-9884) +Merged from 2.1: + * Avoid returning Permission.None when system_auth.permissions table does not + exist (CASSANDRA-10168) * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004) * Add new JMX methods to change local compaction strategy (CASSANDRA-9965) * Write hints for paxos commits (CASSANDRA-7342)
