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/597729d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/597729d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/597729d9 Branch: refs/heads/trunk Commit: 597729d9d7ac6ac5f278dbb01b71e0ce977edd4f Parents: d781923 a029976 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Jan 15 15:06:51 2016 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Jan 15 15:06:51 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java | 3 +-- src/java/org/apache/cassandra/hints/HintsStore.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/597729d9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 950aaaf,478fe08..c7a5c23 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,7 +1,11 @@@ -3.0.3 +3.3 + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010) +Merged from 3.0: + * Remove checksum files after replaying hints (CASSANDRA-10947) * Support passing base table metadata to custom 2i validation (CASSANDRA-10924) * Ensure stale index entries are purged during reads (CASSANDRA-11013) + * (cqlsh) Also apply --connect-timeout to control connection + timeout (CASSANDRA-10959) * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954) * Fix UnsupportedOperationException when reading old sstable with range tombstone (CASSANDRA-10743)
