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 c4254663f539069bac96b9314aed58f997724936
Merge: 917d74b e57a8dd
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Oct 11 12:07:22 2021 -0500
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 17 ++++++++++++++---
src/java/org/apache/cassandra/db/SystemKeyspace.java | 12 ++++++------
3 files changed, 21 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
