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 <m...@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-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
