You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yc...@apache.org on 2021/05/31 18:22:12 UTC

[cassandra] branch trunk updated (c29bdee -> b978cb1)

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

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


    from c29bdee  Merge branch 'cassandra-4.0' into trunk
     add 803a23b  Fix LeveledCompactionStrategy compacts last level throw an ArrayIndexOutOfBoundsException
     add 326802e  Merge branch 'cassandra-3.11' into cassandra-4.0
     new b978cb1  Merge branch 'cassandra-4.0' into trunk

The 1 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 +
 doc/source/operating/compaction/lcs.rst            |  3 ++-
 .../db/compaction/LeveledGenerations.java          |  6 ++---
 .../cassandra/db/compaction/LeveledManifest.java   | 13 ++++++++-
 .../compaction/LeveledCompactionStrategyTest.java  | 31 +++++++++++++++++++++-
 .../org/apache/cassandra/schema/MockSchema.java    |  5 ++++
 6 files changed, 52 insertions(+), 7 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 yc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b978cb1d12b88964bc5f894e3e5364b9cb22cc80
Merge: c29bdee 326802e
Author: Yifan Cai <yc...@apache.org>
AuthorDate: Mon May 31 11:19:42 2021 -0700

    Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt                                        |  1 +
 doc/source/operating/compaction/lcs.rst            |  3 ++-
 .../db/compaction/LeveledGenerations.java          |  6 ++---
 .../cassandra/db/compaction/LeveledManifest.java   | 13 ++++++++-
 .../compaction/LeveledCompactionStrategyTest.java  | 31 +++++++++++++++++++++-
 .../org/apache/cassandra/schema/MockSchema.java    |  5 ++++
 6 files changed, 52 insertions(+), 7 deletions(-)


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