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 2023/01/12 06:13:03 UTC

[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11

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

bereng pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7fe71274d009b18c16f71c7e223eb8f225ed5a8e
Merge: 156cc6fedc 69dfed3671
Author: Bereng <be...@gmail.com>
AuthorDate: Thu Jan 12 07:06:04 2023 +0100

    Merge branch 'cassandra-3.0' into cassandra-3.11

 .circleci/generate.sh | 1 +
 1 file changed, 1 insertion(+)

diff --cc .circleci/generate.sh
index a40e002da7,ac08687556..15c2849645
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@@ -18,7 -18,8 +18,8 @@@
  #
  
  BASEDIR=`dirname $0`
 -BASE_BRANCH=cassandra-3.0
 +BASE_BRANCH=cassandra-3.11
+ set -e
  
  die ()
  {


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