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 b015cbdff6882e20fbc76dcbaf30be982e6a0195
Merge: 08444cb 8b0b22e
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Fri Sep 10 09:34:21 2021 +0200

    Merge branch 'cassandra-4.0' into trunk

 .../org/apache/cassandra/cql3/functions/FromJsonFct.java |  2 +-
 .../cassandra/exceptions/FunctionExecutionException.java | 12 +++++++++---
 .../exceptions/OperationExecutionException.java          | 16 ++++++++--------
 .../cassandra/transport/messages/ErrorMessage.java       |  2 +-
 .../cassandra/cql3/functions/OperationFctsTest.java      | 15 +++++++++++++++
 5 files changed, 34 insertions(+), 13 deletions(-)

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

Reply via email to