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/58c70617 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58c70617 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58c70617 Branch: refs/heads/cassandra-3.3 Commit: 58c706177045a445fd6d9c14e435d346974edef3 Parents: 591cd9e eb12770 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Jan 27 11:50:56 2016 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed Jan 27 11:50:56 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/schema/LegacySchemaMigrator.java | 22 +++++++++++ .../schema/LegacySchemaMigratorTest.java | 39 ++++++++++++++++++++ 3 files changed, 62 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/58c70617/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c7680a9,c99438f..89749f8 --- 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: + * Migrate build status for indexes along with legacy schema (CASSANDRA-11046) * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045) * Added support for IBM zSystems architecture (CASSANDRA-11054) * Update CQL documentation (CASSANDRA-10899)
