natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Mick Semb Wever 2022-01-23 13:02:35 +01:00
parent bccb5adf95 9c6efe1222
commit e769d0d6d6
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NOTICE.txt
View File

@ -1,5 +1,5 @@
Apache Cassandra Apache Cassandra
Copyright 2009-2021 The Apache Software Foundation Copyright 2009-2022 The Apache Software Foundation
This product includes software developed by The Apache Software This product includes software developed by The Apache Software
Foundation (http://www.apache.org/). Foundation (http://www.apache.org/).

2
build.xml
View File

@ -286,7 +286,7 @@
<sequential> <sequential>
<javadoc destdir="@{destdir}" author="true" version="true" use="true" <javadoc destdir="@{destdir}" author="true" version="true" use="true"
windowtitle="${ant.project.name} API" classpathref="cassandra.classpath" windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
bottom="Copyright &amp;copy; 2009-2021 The Apache Software Foundation" bottom="Copyright &amp;copy; 2009-2022 The Apache Software Foundation"
useexternalfile="yes" encoding="UTF-8" failonerror="false" useexternalfile="yes" encoding="UTF-8" failonerror="false"
maxmemory="256m" additionalparam="${jdk11-javadoc-exports}"> maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
<filesets/> <filesets/>

2
debian/copyright vendored
View File

@ -1,7 +1,7 @@
This package was debianized by Eric Evans <eevans@apache.org> on This package was debianized by Eric Evans <eevans@apache.org> on
Sun, 26 Jul 2009 15:12:10 +0000 Sun, 26 Jul 2009 15:12:10 +0000
Upstream Author: Cassandra Developers <cassandra-dev@incubator.apache.org> Upstream Author: Cassandra Developers <dev@cassandra.apache.org>
Copyright (c) 2009, The Apache Software Foundation. Copyright (c) 2009, The Apache Software Foundation.