Merged October 2.0 release to the fast-track branch (#10701)

Signed-off-by: Chris Co <[email protected]>
Signed-off-by: Manuel Huber <[email protected]>
Signed-off-by: Muhammad Falak R Wani <[email protected]>
Co-authored-by: Cameron E Baird <[email protected]>
Co-authored-by: suresh-thelkar <[email protected]>
Co-authored-by: Christopher Co <[email protected]>
Co-authored-by: ms-mahuber <[email protected]>
Co-authored-by: jslobodzian <[email protected]>
Co-authored-by: Neha Agarwal <[email protected]>
Co-authored-by: Muhammad Falak R Wani <[email protected]>
Co-authored-by: CBL-Mariner-Bot <[email protected]>
Co-authored-by: Sumynwa <[email protected]>
Co-authored-by: Henry Beberman <[email protected]>
Co-authored-by: bfjelds <[email protected]>
Co-authored-by: Bala <[email protected]>
Co-authored-by: Ankita Pareek <[email protected]>
Co-authored-by: Riken Maharjan <[email protected]>
Co-authored-by: sindhu-karri <[email protected]>
Co-authored-by: sharath-srikanth-chellappa <[email protected]>
Co-authored-by: Sharath Srikanth Chellappa <[email protected]>
Co-authored-by: Minghe Ren <[email protected]>
Co-authored-by: aadhar-agarwal <[email protected]>
Co-authored-by: Sudipta Pandit <[email protected]>
Co-authored-by: Gary Swalling <[email protected]>
Co-authored-by: Harshit Gupta <[email protected]>
Co-authored-by: nicolas guibourge <[email protected]>
Co-authored-by: Jiri Appl <[email protected]>
Co-authored-by: Rohit Rawat <[email protected]>
Co-authored-by: flora-taagen <[email protected]>
Co-authored-by: Riken Maharjan <[email protected]>
Co-authored-by: himaja-kesari <[email protected]>
Co-authored-by: CBL-Mariner Servicing Account <[email protected]>
(cherry picked from commit 2343f6b)

SPECS/reaper/reaper.spec

@@ -6,7 +6,11 @@
 Summary:        Reaper for cassandra is a tool for running Apache Cassandra repairs against single or multi-site clusters.
 Name:           reaper
 Version:        3.1.1
+<<<<<<< HEAD
 Release:        13%{?dist}
+=======
+Release:        12%{?dist}
+>>>>>>> 2343f6b3c (Merged October 2.0 release to the fast-track branch (#10701))
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -37,7 +41,10 @@ Patch1:         CVE-2023-42282.patch
 Patch2:         CVE-2017-18214.patch
 Patch3:         CVE-2024-42459.patch
 Patch4:         CVE-2024-43796.patch
+<<<<<<< HEAD
 Patch5:         CVE-2024-45590.patch
+=======
+>>>>>>> 2343f6b3c (Merged October 2.0 release to the fast-track branch (#10701))
 BuildRequires:  git
 BuildRequires:  javapackages-tools
 BuildRequires:  maven
@@ -174,9 +181,12 @@ fi
 %{_unitdir}/cassandra-%{name}.service
 
 %changelog
+<<<<<<< HEAD
 * Thu Sep 26 2024 Rohit Rawat <[email protected]> - 3.1.1-13
 - Patch CVE-2024-45590 in body-parser module
 
+=======
+>>>>>>> 2343f6b3c (Merged October 2.0 release to the fast-track branch (#10701))
 * Wed Sep 25 2024 Rohit Rawat <[email protected]> - 3.1.1-12
 - Patch CVE-2024-43796 in express module