From d59bce0a0e888bd80d05c334a5acac4b8d963d92 Mon Sep 17 00:00:00 2001
From: Joao Afonso <joao.afonso@cern.ch>
Date: Mon, 6 May 2024 15:56:06 +0200
Subject: [PATCH] Merging x.10.9.1 and x.10.10.1 patches
---
ReleaseNotes.md | 13 +++++++++++++
cta.spec.in | 10 +++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index d2698f5cc9..9af68233de 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -25,6 +25,14 @@
- cta/CTA#575 - Remove rados metrics logging
- cta/CTA#675 - Renaming PostgresSchedDB to RelationalDB and introducing rdbms directory model to the Scheduler DB code
+# v4.10.10.1-1 / v5.10.10.1-1
+
+## Features
+- cta/CTA#646 - JSON logging with correct field types
+
+### Bug Fixes
+- cta/CTA#634 - Fix crash of ctafrontend in initialisation for missing config values
+
# v4.10.10.0-1 / v5.10.10.0-1
### Features
@@ -43,6 +51,11 @@
- cta/CTA#628 - Retry system tests in the ci
- cta/operations#1296 - Convention for CTA repositories
+# v4.10.9.1-1 / v5.10.9.1-1
+
+### Bug Fixes
+- cta/CTA#634 - Fix crash of ctafrontend in initialisation for missing config values
+
# v4.10.9.0-1 / v5.10.9.0-1
### Features
diff --git a/cta.spec.in b/cta.spec.in
index 964f3a9a5a..727256200d 100644
--- a/cta.spec.in
+++ b/cta.spec.in
@@ -629,10 +629,18 @@ echo $(jq --argjson CTA_XROOTD_VERSION cta_xrootd_version '. += {"cta_xrootd_ver
%changelog
+* Wed Apr 03 2024 Joao Afonso <joao.afonso@cern.ch> - 4.10.10.1-1
+- JSON logging with correct field types
+- Fixed ctafrontend crash during initialisation due to missing config values
+- See ReleaseNotes.md for details
+
+* Wed Apr 03 2024 Joao Afonso <joao.afonso@cern.ch> - 4.10.9.1-1
+- Fixed ctafrontend crash during initialisation due to missing config values
+- See ReleaseNotes.md for details
+
* Wed Mar 13 2024 Joao Afonso <joao.afonso@cern.ch> - 4.10.10.0-1
- Various fixes and improvements to CTA
- Deprecating TPCONFIG configuration in favour of cta-taped.conf
-- See ReleaseNotes.md for details
* Wed Feb 14 2024 Joao Afonso <joao.afonso@cern.ch> - 4.10.9.0-1
- Various fixes and improvements to CTA
--
GitLab