[cassandra] branch trunk updated (669261e -> 592d5e3)

[ad...@apache.org]

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

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


    from 669261e  Merge branch 'cassandra-4.0' into trunk
     new 69b653a  Remove mutation data from error log message
     new 01add65  Merge branch 'cassandra-3.0' into cassandra-3.11
     new bc51c57  Merge branch 'cassandra-3.11' into cassandra-4.0
     new 592d5e3  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/service/StorageProxy.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

---------------------------------------------------------------------
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

[ad...@apache.org]

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 592d5e336dca262a420fff385c94073725e7cc33
Merge: 669261e bc51c57
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Thu Jul 29 12:06:26 2021 +0100

    Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/service/StorageProxy.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)


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