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:28:01 UTC

[cassandra] branch trunk updated (26bf078 -> 1ca245f)

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

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


    from 26bf078  Fix broken IntelliJ configuration Authored by Jacek Lewandowski; reviewed by Ekaterina Dimitrova and Michael Semb Wever for CASSANDRA-16618
     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
     new 1ca245f  Merge branch 'cassandra-3.11' into trunk

The 4 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.11' into trunk

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

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

commit 1ca245f5c8aaee456ee4248743e0cc29e9bd20d5
Merge: 26bf078 618b48d
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Fri Apr 23 15:22:59 2021 +0200

    Merge branch 'cassandra-3.11' into trunk

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

diff --cc .gitignore
index cd668ae,3bf7478..a634687
--- a/.gitignore
+++ b/.gitignore
@@@ -9,8 -9,7 +9,9 @@@ data
  conf/hotspot_compiler
  doc/cql3/CQL.html
  doc/build/
 +lib/
+ pylib/src/
 +!lib/cassandra-driver-internal-only-*.zip
  
  # C* debs
  build-stamp

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