You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2021/04/23 13:27:59 UTC

[cassandra] branch cassandra-3.11 updated (d1eb6d0 -> 618b48d)

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

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


    from d1eb6d0  Merge branch 'cassandra-3.0' into cassandra-3.11
     new ad16aa1  Provide a better failure message when the rat check fails
     new f804657  Merge branch 'cassandra-2.2' into cassandra-3.0
     new 618b48d  Merge branch 'cassandra-3.0' into cassandra-3.11

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:
 .build/build-rat.xml | 5 ++++-
 .gitignore           | 3 ++-
 2 files changed, 6 insertions(+), 2 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-3.0' into cassandra-3.11

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

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

commit 618b48db4199bfa18b4a8b242abf35016bbf5084
Merge: d1eb6d0 f804657
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Fri Apr 23 15:02:59 2021 +0200

    Merge branch 'cassandra-3.0' into cassandra-3.11

 .build/build-rat.xml | 5 ++++-
 .gitignore           | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --cc .gitignore
index 4353d4f,715f971..3bf7478
--- a/.gitignore
+++ b/.gitignore
@@@ -8,7 -8,7 +8,8 @@@ logs
  data/
  conf/hotspot_compiler
  doc/cql3/CQL.html
 +doc/build/
+ pylib/src/
  
  # C* debs
  build-stamp

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