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/dd816b3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd816b3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd816b3d Branch: refs/heads/trunk Commit: dd816b3d7cf213d1b0c4dbebb1761a7ce38280a9 Parents: 94c4bdb d2b7051 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 22 18:02:29 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 22 18:02:29 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 -- src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd816b3d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6b25d10,4a0bca8..94b723c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,4 +1,6 @@@ -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/dd816b3d/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ----------------------------------------------------------------------
