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 e49853914bd407827093cebf5151db0ebe2eba9e Merge: 04b0049 c092c46 Author: Mick Semb Wever <[email protected]> AuthorDate: Tue Jun 9 09:44:50 2020 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 .gitignore | 1 + CHANGES.txt | 1 + build.xml | 4 ++++ 3 files changed, 6 insertions(+) diff --cc .gitignore index f5b1ce1,8954831..b6fd009 --- a/.gitignore +++ b/.gitignore @@@ -71,7 -71,4 +71,8 @@@ lib/jsr223/jython/*.ja lib/jsr223/jython/cachedir lib/jsr223/scala/*.jar -.ant_targets +/.ant-targets-build.xml ++.ant_targets + +# Generated files from the documentation +doc/source/configuration/cassandra_config_file.rst --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
