You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/10/01 11:00:25 UTC
[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0ccca8dab21719cc9248a87542a504cc057700e1
Merge: 97108ef 339e8b7
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Fri Oct 1 11:59:09 2021 +0100
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/service/StorageService.java | 8 +-
.../apache/cassandra/streaming/StreamManager.java | 58 +++++++----
.../tools/nodetool/SetInterDCStreamThroughput.java | 3 +-
.../tools/nodetool/SetStreamThroughput.java | 3 +-
.../cassandra/streaming/StreamManagerTest.java | 91 ++++++++++++++++++
.../SetGetInterDCStreamThroughputTest.java | 105 ++++++++++++++++++++
.../tools/nodetool/SetGetStreamThroughputTest.java | 106 +++++++++++++++++++++
8 files changed, 353 insertions(+), 22 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org