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/94c4bdb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94c4bdb6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94c4bdb6 Branch: refs/heads/cassandra-3.3 Commit: 94c4bdb6f1d1524325de5b0805541b1575a73dcb Parents: 7074dda b214722 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 22 16:55:58 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 22 16:55:58 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/94c4bdb6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 94b723c,8bfb1d1..6b25d10 --- 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: + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) * Update CQL documentation (CASSANDRA-10899) * Check the column name, not cell name, for dropped columns when reading legacy sstables (CASSANDRA-11018) http://git-wip-us.apache.org/repos/asf/cassandra/blob/94c4bdb6/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ----------------------------------------------------------------------
