Merge branch 'cassandra-4.1' into cassandra-5.0

This commit is contained in:
Stefan Miklosovic 2023-08-15 13:59:40 +02:00
commit 1ffe90b1f7
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 3 additions and 2 deletions

View File

@ -185,6 +185,7 @@ Merged from 4.0:
* Partial compaction can resurrect deleted data (CASSANDRA-18507)
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)

View File

@ -49,7 +49,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-11-headless or java-17-headless)
Requires: python(abi) >= 3.6
Requires: procps-ng >= 3.3
Requires(pre): user(cassandra)

View File

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