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/ebb2b1be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebb2b1be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebb2b1be Branch: refs/heads/trunk Commit: ebb2b1bedaf86195b144d519a3826adafe1327b5 Parents: dea36bd 25366f7 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Oct 14 11:21:28 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Oct 14 11:21:28 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/formatting.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebb2b1be/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 49a3c57,c02e2fa..54b505a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,6 +1,22 @@@ -2.2.4 +3.0-rc2 + * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447) + * Allow EACH_QUORUM for reads (CASSANDRA-9602) + * Fix potential ClassCastException while upgrading (CASSANDRA-10468) + * Fix NPE in MVs on update (CASSANDRA-10503) + * Only include modified cell data in indexing deltas (CASSANDRA-10438) + * Do not load keyspace when creating sstable writer (CASSANDRA-10443) + * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413) + * Re-populate token metadata after commit log recovery (CASSANDRA-10293) + * Provide additional metrics for materialized views (CASSANDRA-10323) + * Flush system schema tables after local schema changes (CASSANDRA-10429) +Merged from 2.2: + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487) + * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412) + * Preserve case of quoted Role & User names (CASSANDRA-10394) + * cqlsh pg-style-strings broken (CASSANDRA-10484) + * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) Merged from 2.1: + * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523) * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970) * Don't allow startup if the node's rack has changed (CASSANDRA-10242) * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)