Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/baffdeae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/baffdeae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/baffdeae Branch: refs/heads/trunk Commit: baffdeae85b1b577e55a2b4dd9564ee507dd387a Parents: e1f2300 e4cef08 Author: Stefan Podkowinski <s.podkowin...@gmail.com> Authored: Wed May 24 14:24:10 2017 +0200 Committer: Stefan Podkowinski <s.podkowin...@gmail.com> Committed: Wed May 24 14:24:23 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/repair/messages/RepairOption.java | 4 ++ .../org/apache/cassandra/utils/MerkleTree.java | 42 +++++++++++++++++++- .../apache/cassandra/utils/MerkleTreeTest.java | 34 +++++++++++++++- 4 files changed, 78 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/baffdeae/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c3e485d,fd9647e..87cb817 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -107,8 -35,10 +107,9 @@@ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307) * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835) Merged from 3.0: + * Fix repair process violating start/end token limits for small ranges (CASSANDRA-13052) * Add storage port options to sstableloader (CASSANDRA-13518) * Properly handle quoted index names in cqlsh DESCRIBE output (CASSANDRA-12847) - * Avoid reading static row twice from old format sstables (CASSANDRA-13236) * Fix NPE in StorageService.excise() (CASSANDRA-13163) * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265) * Fail repair if insufficient responses received (CASSANDRA-13397) http://git-wip-us.apache.org/repos/asf/cassandra/blob/baffdeae/src/java/org/apache/cassandra/repair/messages/RepairOption.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/baffdeae/src/java/org/apache/cassandra/utils/MerkleTree.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
