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/ef32d629 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef32d629 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef32d629 Branch: refs/heads/cassandra-3.3 Commit: ef32d629d5f549394bab164ed04a44b76db1b4c2 Parents: 456581e c1a113a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Jan 19 11:02:22 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jan 19 11:02:22 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/LegacyLayout.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef32d629/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4965920,04d0354..b70464f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,6 +1,8 @@@ -3.0.3 +3.3 + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010) +Merged from 3.0: + * Check the column name, not cell name, for dropped columns when reading + legacy sstables (CASSANDRA-11018) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef32d629/src/java/org/apache/cassandra/db/LegacyLayout.java ----------------------------------------------------------------------
