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 2020/06/09 07:50:35 UTC
[cassandra] branch cassandra-3.11 updated (04b0049 -> e498539)
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 04b0049 Merge branch 'cassandra-3.0' into cassandra-3.11
new 3340247 Remove generated files from apache-cassandra-*-src.tar.gz artifacts
new c092c46 Merge branch 'cassandra-2.2' into cassandra-3.0
new e498539 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:
.gitignore | 1 +
CHANGES.txt | 1 +
build.xml | 4 ++++
3 files changed, 6 insertions(+)
---------------------------------------------------------------------
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 e49853914bd407827093cebf5151db0ebe2eba9e
Merge: 04b0049 c092c46
Author: Mick Semb Wever <mc...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org