[cassandra] branch trunk updated (cf15ac80a2 -> b69ac3ffcc)

[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 cf15ac80a2 Merge branch 'cassandra-4.1' into trunk
     new 2b511c5714 ninja-fix: Fix bashisms on .circleci/generate.sh
     new c7d665dcc7 Merge branch 'cassandra-3.0' into cassandra-3.11
     new a9df34c62a Merge branch 'cassandra-3.11' into cassandra-4.0
     new f90148a344 Merge branch 'cassandra-4.0' into cassandra-4.1
     new b69ac3ffcc Merge branch 'cassandra-4.1' into trunk

The 5 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:
 .circleci/generate.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 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

[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 b69ac3ffcc2a4736d6eeb28535f14f657222624e
Merge: cf15ac80a2 f90148a344
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Wed Oct 19 12:51:24 2022 +0100

    Merge branch 'cassandra-4.1' into trunk

 .circleci/generate.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)



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