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/f3c5faba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3c5faba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3c5faba Branch: refs/heads/cassandra-3.0 Commit: f3c5faba0705e819bdc529f17bbbaca403116e85 Parents: 3bc585d 8c43b8c Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Aug 31 16:43:09 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Aug 31 16:43:09 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 8 +++++ .../org/apache/cassandra/tools/NodeProbe.java | 2 ++ .../org/apache/cassandra/tools/NodeTool.java | 1 + .../tools/nodetool/GetTraceProbability.java | 33 ++++++++++++++++++++ 4 files changed, 44 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3c5faba/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f69f09f,d9f8a50..08b7df0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,14 +1,26 @@@ -2.2.2 +3.0.0-beta2 + * 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: * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks (CASSANDRA-10199) + Merged from 2.1: + * Only check KeyCache when it is enabled + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611) + * (cqlsh) update list of CQL keywords (CASSANDRA-9232) + * Add nodetool gettraceprobability command (CASSANDRA-10234) + + + 2.2.1 * Fix race during construction of commit log (CASSANDRA-10049) * Fix LeveledCompactionStrategyTest (CASSANDRA-9757) * Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3c5faba/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3c5faba/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------