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/456581e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/456581e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/456581e5 Branch: refs/heads/cassandra-3.3 Commit: 456581e54b4211216db16ddd203a325f8a309aeb Parents: 289ad77 c7cbde2 Author: Sam Tunnicliffe <[email protected]> Authored: Tue Jan 19 08:58:21 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Tue Jan 19 08:58:21 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../index/internal/CassandraIndex.java | 7 ++++++ .../validation/entities/SecondaryIndexTest.java | 24 ++++++++++++++++++++ 3 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/456581e5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2c19a1b,9c0ab85..4965920 --- 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: + * Don't attempt to index clustering values of static rows (CASSANDRA-11021) * Remove checksum files after replaying hints (CASSANDRA-10947) * Support passing base table metadata to custom 2i validation (CASSANDRA-10924) * Ensure stale index entries are purged during reads (CASSANDRA-11013) http://git-wip-us.apache.org/repos/asf/cassandra/blob/456581e5/src/java/org/apache/cassandra/index/internal/CassandraIndex.java ----------------------------------------------------------------------
