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/d996c36c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d996c36c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d996c36c
Branch: refs/heads/trunk
Commit: d996c36c3fff4a965b208b1646f14a475d417d94
Parents: 55fb5cd 813eb23
Author: Marcus Eriksson <[email protected]>
Authored: Thu Sep 10 08:37:57 2015 +0200
Committer: Marcus Eriksson <[email protected]>
Committed: Thu Sep 10 08:37:57 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/cassandra/io/sstable/IndexSummaryManager.java | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d996c36c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 72fe737,e1365b5..7b75b96
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,7 +1,38 @@@
-2.2.2
+3.0.0-rc1
+ * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
+ * Small optimizations of sstable index serialization (CASSANDRA-10232)
+ * Support for both encrypted and unencrypted native transport connections
(CASSANDRA-9590)
+Merged from 2.2:
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
+Merged from 2.1:
+ * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
+ * Scrub, Cleanup and Upgrade do not unmark compacting until all operations
+ have completed, regardless of the occurence of exceptions (CASSANDRA-10274)
+
+
+3.0.0-beta2
+ * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220)
+ * Fix backward compatibility issue due to AbstractBounds serialization bug
(CASSANDRA-9857)
+ * Fix startup error when upgrading nodes (CASSANDRA-10136)
+ * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation
(CASSANDRA-10147)
+ * 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:
+ * Cancel transaction for sstables we wont redistribute index summary
+ for (CASSANDRA-10270)
- * Handle missing RoleManager in config after upgrade to 2.2
(CASSANDRA-10209)
* Retry snapshot deletion after compaction and gc on Windows
(CASSANDRA-10222)
* Fix failure to start with space in directory path on Windows
(CASSANDRA-10239)
* Fix repair hang when snapshot failed (CASSANDRA-10057)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d996c36c/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
----------------------------------------------------------------------
