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/2ac45aed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ac45aed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ac45aed Branch: refs/heads/cassandra-2.2 Commit: 2ac45aed90067c68113b9edd7b79a777f6b80e76 Parents: 1dc19a6 7e1ea4c Author: blerer <benjamin.le...@datastax.com> Authored: Wed Aug 26 15:20:41 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Wed Aug 26 15:22:04 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++-- src/java/org/apache/cassandra/config/Config.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ac45aed/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 97d8b8b,26dc34b..f9d9ae1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,9 +1,19 @@@ -2.1.10 +2.2.1 + * (cqlsh) add CLEAR 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: + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611) * (cqlsh) update list of CQL keywords (CASSANDRA-9232) - - -2.1.9 * Avoid race condition during read repair (CASSANDRA-9460) * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898) * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ac45aed/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ac45aed/src/java/org/apache/cassandra/config/Config.java ----------------------------------------------------------------------