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/83064bfd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83064bfd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83064bfd Branch: refs/heads/trunk Commit: 83064bfd58092c263c130b51d89404376c2d891f Parents: fd08e75 7226718 Author: Benjamin Lerer <[email protected]> Authored: Thu Jan 21 12:03:45 2016 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Thu Jan 21 12:03:45 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83064bfd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a9ba475,89d34ec..ca529fc --- 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: + * Update CQL documentation (CASSANDRA-10899) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/83064bfd/doc/cql3/CQL.textile ----------------------------------------------------------------------
