You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sm...@apache.org on 2023/01/23 14:32:10 UTC
[cassandra] branch trunk updated (6226ec277b -> a77f941657)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 6226ec277b Merge branch 'cassandra-4.1' into trunk
add 357c0d5a89 Expand build.dir property in rat targets
add f52b316016 Merge branch 'cassandra-3.0' into cassandra-3.11
add 669731b033 Merge branch 'cassandra-3.11' into cassandra-4.0
add 5c93731eee Merge branch 'cassandra-4.0' into cassandra-4.1
new a77f941657 Merge branch 'cassandra-4.1' into trunk
The 1 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 | 8 ++++----
.gitignore | 1 +
CHANGES.txt | 1 +
3 files changed, 6 insertions(+), 4 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-4.1' into trunk
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a77f941657d51f89148f8560f2644f98d21b75e0
Merge: 6226ec277b 5c93731eee
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Mon Jan 23 15:17:11 2023 +0100
Merge branch 'cassandra-4.1' into trunk
.build/build-rat.xml | 8 ++++----
.gitignore | 1 +
CHANGES.txt | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --cc .build/build-rat.xml
index ec8632bae6,49d20ccb75..f261a23cd1
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@@ -49,10 -49,9 +49,10 @@@
<target name="rat-check" depends="_rat_copy_versioned_files" unless="${rat.skip}" description="License checks on source" >
<rat:report reportFile="${build.dir}/rat.txt">
- <fileset dir="." includesfile="build/.ratinclude">
+ <fileset dir="." includesfile="${build.dir}/.ratinclude">
<!-- Config files with not much creativity -->
<exclude name="**/.asf.yaml"/>
+ <exclude name="**/.github/pull_request_template.md"/>
<exclude name="**/ide/**/*"/>
<exclude name="**/metrics-reporter-config-sample.yaml"/>
<exclude name="**/cassandra.yaml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org