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/dfb90b14 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfb90b14 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfb90b14 Branch: refs/heads/trunk Commit: dfb90b1458ac6ee427f9e329b45c764a3a0a0c06 Parents: c66044f c2299e6 Author: Yuki Morishita <[email protected]> Authored: Fri May 12 16:00:10 2017 +0900 Committer: Yuki Morishita <[email protected]> Committed: Fri May 12 16:00:10 2017 +0900 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/tools/LoaderOptions.java | 26 ++++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfb90b14/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 889a3b2,9b31d48..b8b2b90 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -98,7 -33,9 +98,8 @@@ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307) * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835) Merged from 3.0: + * 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) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
