Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9c0e178 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9c0e178 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9c0e178 Branch: refs/heads/trunk Commit: e9c0e1787e44903109ed4520d055e983ca20c16e Parents: 66b0e1d e1fc0e0 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Thu Sep 3 12:42:04 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Thu Sep 3 12:42:04 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra.bat | 2 +- conf/cassandra-env.ps1 | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 751b75d,fcb9ed7..c1f6992 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ -2.2.2 +3.0.0-beta2 + * Improve batchlog write patch (CASSANDRA-9673) + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164) + * 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 failure to start with space in directory path on Windows (CASSANDRA-10239) * Fix repair hang when snapshot failed (CASSANDRA-10057) * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks (CASSANDRA-10199) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/conf/cassandra-env.ps1 ----------------------------------------------------------------------