You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/07/21 19:15:11 UTC

[cassandra] branch trunk updated (29cc615 -> 818e0ba)

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 29cc615  Merge branch 'cassandra-4.0' into trunk
     new 426253a  Calculate time remaining correctly for all compaction types in compactionstats
     new 87645a9  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 0779160  Merge branch 'cassandra-3.11' into cassandra-4.0
     new 818e0ba  Merge branch 'cassandra-4.0' into trunk

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 818e0baa6233b7e1182a411df2286c5f5fe3c00e
Merge: 29cc615 0779160
Author: Brandon Williams <br...@apache.org>
AuthorDate: Wed Jul 21 14:14:30 2021 -0500

    Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/tools/nodetool/CompactionStats.java | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org