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

[cassandra] branch trunk updated (e936b2cc1b -> 1b2e49e97c)

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

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


    from e936b2cc1b fix serialization error in getsstables --show-levels
     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
     new a0c6191238 Merge branch 'cassandra-4.0' into cassandra-4.1
     new 1b2e49e97c 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 | 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-4.1' into trunk

Posted by be...@apache.org.
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 1b2e49e97c138124d2a74900dfefd5ea6fec1cef
Merge: e936b2cc1b a0c6191238
Author: Bereng <be...@gmail.com>
AuthorDate: Thu Jan 12 07:09:54 2023 +0100

    Merge branch 'cassandra-4.1' into trunk

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

diff --cc .circleci/generate.sh
index 379af70bdf,faa5f80b43..c605e835f5
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@@ -18,7 -18,8 +18,8 @@@
  #
  
  BASEDIR=`dirname $0`
 -BASE_BRANCH=cassandra-4.1
 +BASE_BRANCH=trunk
+ set -e
  
  die ()
  {


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