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/44e19947 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44e19947 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44e19947 Branch: refs/heads/trunk Commit: 44e19947f451945788c6f8fbaa167255347389a6 Parents: 00f0feb 0a4ce44 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Sep 1 09:22:52 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Sep 1 09:22:52 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e19947/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6a0b0b6,ffff102..6539792 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ -2.2.2 +3.0.0-beta2 + * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901) + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554) + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156) + * Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182) + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197) + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181) + * Fix double flushing of secondary index tables (CASSANDRA-10180) + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046) + * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061) + * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060) + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917) + * Fix sstablerepairedset (CASSANDRA-10132) +Merged from 2.2: + * Fix repair hang when snapshot failed (CASSANDRA-10057) * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks (CASSANDRA-10199) Merged from 2.1: http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e19947/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java ----------------------------------------------------------------------