From 1c206a4268ecbb31b75d60a1092ac562726dde28 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 20 Jun 2023 06:28:58 +0200
Subject: Merging upstream version 20221226.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 CHANGELOG.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CHANGELOG.txt')

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2bca1d1..859b599 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+2022-12-26	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20221226.
+
+	[ Daniel Baumann ]
+	* Adding root_intermediate_cert to exit_hook.extra-cleanup dehydrated hook.
+	* Creating relative links for extra certificates in deploy_cert.extra dehydrated hook.
+
 2022-12-25	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20221225.
-- 
cgit v1.2.3