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:04 UTC

[cassandra] branch cassandra-4.0 updated (f17e431f24 -> 6c65c9e49e)

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

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


    from f17e431f24 Merge branch 'cassandra-3.11' into cassandra-4.0
     new 69dfed3671 When generate.sh fails its rc=0
     new 7fe71274d0 Merge branch 'cassandra-3.0' into cassandra-3.11
     new 6c65c9e49e Merge branch 'cassandra-3.11' into cassandra-4.0

The 3 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 | 1 +
 1 file changed, 1 insertion(+)


---------------------------------------------------------------------
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-3.11' into cassandra-4.0

Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6c65c9e49e656fc1fc4ae23adda391d0e3d4f2b4
Merge: f17e431f24 7fe71274d0
Author: Bereng <be...@gmail.com>
AuthorDate: Thu Jan 12 07:07:30 2023 +0100

    Merge branch 'cassandra-3.11' into cassandra-4.0

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

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


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