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/b13e480e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b13e480e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b13e480e
Branch: refs/heads/cassandra-3.0
Commit: b13e480e6ecbb2306146b9f671bde7edf2b11937
Parents: 79097d7 ccb738f
Author: blerer <benjamin.le...@datastax.com>
Authored: Wed Oct 21 10:20:27 2015 +0200
Committer: blerer <benjamin.le...@datastax.com>
Committed: Wed Oct 21 10:20:27 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b13e480e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6c97ffb,4f5e8a7..69e616f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,31 -8,14 +7,32 @@@ Merged from 2.1
* Fix paging issues with partitions containing only static columns data
(CASSANDRA-10381)
* Fix conditions on static columns (CASSANDRA-10264)
* AssertionError: attempted to delete non-existing file CommitLog
(CASSANDRA-10377)
- * (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)
+ * Fix sorting for queries with an IN condition on partition key columns
(CASSANDRA-10363)
-2.2.3
+3.0-rc2
+ * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes
(CASSANDRA-10473)
+ * Remove circular references in SegmentedFile (CASSANDRA-10543)
+ * Ensure validation of indexed values only occurs once per-partition
(CASSANDRA-10536)
+ * Fix handling of static columns for range tombstones in thrift
(CASSANDRA-10174)
+ * Support empty ColumnFilter for backward compatility on empty IN
(CASSANDRA-10471)
+ * Remove Pig support (CASSANDRA-10542)
+ * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)
+ * Revert CASSANDRA-7486, make CMS default GC, move GC config to
+ conf/jvm.options (CASSANDRA-10403)
+ * 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:
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+ * 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)
