You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2022/07/11 07:51:17 UTC
[cassandra] branch trunk updated (89f3978dcd -> cc28e1a85e)
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 89f3978dcd Add a virtual table that exposes currently running queries
new 1d80dd0086 Fix flaky test - org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest.testConditionalUpdate
new cc28e1a85e Merge branch 'cassandra-4.1' into trunk
The 2 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:
src/java/org/apache/cassandra/gms/Gossiper.java | 13 +++++++++++--
.../cassandra/utils/ExpiringMemoizingSupplier.java | 5 ++---
.../operations/InsertUpdateIfConditionTest.java | 21 +++++++++++++++++----
3 files changed, 30 insertions(+), 9 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.1' into trunk
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit cc28e1a85e2e5760436030ca57667fa69d6de233
Merge: 89f3978dcd 1d80dd0086
Author: Bereng <be...@gmail.com>
AuthorDate: Mon Jul 11 09:47:29 2022 +0200
Merge branch 'cassandra-4.1' into trunk
src/java/org/apache/cassandra/gms/Gossiper.java | 13 +++++++++++--
.../cassandra/utils/ExpiringMemoizingSupplier.java | 5 ++---
.../operations/InsertUpdateIfConditionTest.java | 21 +++++++++++++++++----
3 files changed, 30 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org