Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ff4a653 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ff4a653 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ff4a653 Branch: refs/heads/trunk Commit: 7ff4a653f24ed4951a56859de2e5032d802693bd Parents: 1aa14bc f919cf4 Author: Jeff Jirsa <jji...@apple.com> Authored: Wed Jul 26 16:56:51 2017 -0700 Committer: Jeff Jirsa <jji...@apple.com> Committed: Wed Jul 26 16:57:34 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hints/ChecksummedDataInput.java | 2 +- .../apache/cassandra/hints/HintsDescriptor.java | 2 +- .../org/apache/cassandra/hints/HintsReader.java | 2 +- .../apache/cassandra/hints/HintsReaderTest.java | 172 +++++++++++++++++++ 5 files changed, 176 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ff4a653/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index cfa4a24,5e6d189..dd8f88b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,12 @@@ +3.11.1 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721) + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: 3.0.15 * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722) - * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize (Backport CASSANDRA-13329) + * Fix Digest mismatch Exception if hints file has UnknownColumnFamily (CASSANDRA-13696) * Purge tombstones created by expired cells (CASSANDRA-13643) * Make concat work with iterators that have different subsets of columns (CASSANDRA-13482) * Set test.runners based on cores and memory size (CASSANDRA-13078) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ff4a653/src/java/org/apache/cassandra/hints/ChecksummedDataInput.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ff4a653/src/java/org/apache/cassandra/hints/HintsDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ff4a653/src/java/org/apache/cassandra/hints/HintsReader.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
