From a7308e1e8fa811acf3520abbf2db6874ec0244f9 Mon Sep 17 00:00:00 2001
From: rebortg <24626486+rebortg@users.noreply.github.com>
Date: Tue, 16 Apr 2024 18:56:23 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.4.rst |  7 +++++++
 docs/changelog/1.5.rst | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 8034e76f..8f778f98 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 8034e76f6b8d0813ad1a447935809efcd203be47
+Subproject commit 8f778f989d8fed30eec0a95d5b1fbb67594c67df
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index e7927899..ed68ae8a 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,13 @@
    _ext/releasenotes.py
 
 
+2024-04-15
+==========
+
+* :vytask:`T6100` ``(bug): NAT config migration error in 1.4.0-epa1 if invalid address/network defined in 1.3.6 version``
+* :vytask:`T5734` ``(bug): OpenVPN server dh-params that are not in PKI error``
+
+
 2024-04-14
 ==========
 
diff --git a/docs/changelog/1.5.rst b/docs/changelog/1.5.rst
index 1eb6acd3..aaa88c90 100644
--- a/docs/changelog/1.5.rst
+++ b/docs/changelog/1.5.rst
@@ -8,6 +8,21 @@
    _ext/releasenotes.py
 
 
+2024-04-16
+==========
+
+* :vytask:`T6099` ``(bug): Suppress unsupported interfaces from appearing in messages log by Telegraf``
+
+
+2024-04-15
+==========
+
+* :vytask:`T6163` ``(bug): kea-dhcp4-server crashes due to incorrect lease file permissions after 1.5-rolling-202403120022 -> 1.5-rolling-202403230018 upgrade``
+* :vytask:`T6100` ``(bug): NAT config migration error in 1.4.0-epa1 if invalid address/network defined in 1.3.6 version``
+* :vytask:`T6174` ``(bug): can't view dhcp server leases if logged in as a tacacs account``
+* :vytask:`T5734` ``(bug): OpenVPN server dh-params that are not in PKI error``
+
+
 2024-04-14
 ==========
 
-- 
cgit v1.2.3