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

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Stefan Miklosovic 2023-08-15 13:57:18 +02:00
parent c778a76adb 7857210641
commit 9383cb3c85
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -6,6 +6,7 @@ Merged from 4.0:
* Migrate Python optparse to argparse (CASSANDRA-17914)
Merged from 3.11:
Merged from 3.0:
* Fix Requires for Java for RPM package (CASSANDRA-18751)
* Fix CQLSH online help topic link (CASSANDRA-17534)
* Remove unused suppressions (CASSANDRA-18724)

2
redhat/cassandra.spec
View File

@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{relname}root-%(%{__id_u} -n)
BuildRequires: ant >= 1.9
BuildRequires: ant-junit >= 1.9
Requires: (jre-1.8.0 or jre-11)
Requires: (java-1.8.0-headless or java-11-headless)
Requires: python(abi) >= 3.6
Requires: procps-ng >= 3.3
Requires(pre): user(cassandra)

2
redhat/noboolean/cassandra.spec
View File

@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{relname}root-%(%{__id_u} -n)
BuildRequires: ant >= 1.9
BuildRequires: ant-junit >= 1.9
Requires: jre >= 1.8.0
Requires: java-1.8.0-headless
Requires: python(abi) >= 3.6
Requires: procps-ng >= 3.3
Requires(pre): user(cassandra)