Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8feb66e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8feb66e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8feb66e6 Branch: refs/heads/cassandra-3.1 Commit: 8feb66e6fb57521a831a1a6627eb7e0e52462fd4 Parents: 521cc54 ae315b5 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Nov 24 23:24:13 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Nov 24 23:24:13 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/MigrationManager.java | 24 ++++++++++++++++-- .../apache/cassandra/service/MigrationTask.java | 26 ++++++++++++++++++++ .../cassandra/service/StorageService.java | 9 +++---- 4 files changed, 53 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8feb66e6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 038840a,116d4c3..75922bf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.1 +3.1 +Merged from 3.0: + * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731) * Unable to create a function with argument of type Inet (CASSANDRA-10741) * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717) * Correctly preserve deletion info on updated rows when notifying indexers
