Resolve merge conflict on Changelog

Signed-off-by: Ranjith Gopal <ranjith.gopalreddy@7-11.com>
kedacore · May 27, 2024 · 8013d5a · 8013d5a
1 parent d845f65
commit 8013d5a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -72,6 +72,7 @@ Here is an overview of all new **experimental** features:
 - **GCP Scalers**: Added custom time horizon in GCP scalers ([#5778](https://github.com/kedacore/keda/issues/5778))
 - **GitHub Scaler**: Fixed pagination, fetching repository list ([#5738](https://github.com/kedacore/keda/issues/5738))
 - **Kafka**: Fix logic to scale to zero on invalid offset even with earliest offsetResetPolicy ([#5689](https://github.com/kedacore/keda/issues/5689))
+- *Cassandra Scaler*: Add TLS support for cassandra scaler ([#5802](https://github.com/kedacore/keda/issues/5802))
 
 ### Fixes