Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/591cd9e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/591cd9e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/591cd9e0 Branch: refs/heads/trunk Commit: 591cd9e05eba945968aad4b14a51db95c136c88b Parents: a2fbe18 5ec40a3 Author: Sam Tunnicliffe <[email protected]> Authored: Wed Jan 27 11:09:18 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Jan 27 11:09:18 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 4 +- .../org/apache/cassandra/db/LegacyLayout.java | 2 +- .../index/internal/CassandraIndex.java | 39 ++++++++++++++++---- 3 files changed, 35 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/591cd9e0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bac9a03,024aaa0..c7680a9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -3.0.3 +3.3 + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010) +Merged from 3.0: + * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045) * Added support for IBM zSystems architecture (CASSANDRA-11054) * Update CQL documentation (CASSANDRA-10899) * Check the column name, not cell name, for dropped columns when reading @@@ -350,7 -318,7 +351,8 @@@ Merged from 2.2 * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks (CASSANDRA-10199) Merged from 2.1: -- * Added configurable warning threshold for GC duration (CASSANDRA-8907) ++ * ure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045) ++dded configurable warning threshold for GC duration (CASSANDRA-8907) * Fix handling of streaming EOF (CASSANDRA-10206) * Only check KeyCache when it is enabled * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611) http://git-wip-us.apache.org/repos/asf/cassandra/blob/591cd9e0/src/java/org/apache/cassandra/db/LegacyLayout.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/591cd9e0/src/java/org/apache/cassandra/index/internal/CassandraIndex.java ----------------------------------------------------------------------
