From 1f8dbc4c9c0cc52a0cddc9f7a489de88e13565d9 Mon Sep 17 00:00:00 2001
From: rebortg <24626486+rebortg@users.noreply.github.com>
Date: Mon, 1 Apr 2024 06:06:03 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.4.rst | 21 +++++++++++++++++++++
 docs/changelog/1.5.rst | 27 +++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 25891616..9edf1e7c 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 25891616fd74013241dc755166c7e3ad732849cc
+Subproject commit 9edf1e7c23f13e682bbe4b2ae75ff4be897822ab
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 884e7699..36e9c88c 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,27 @@
    _ext/releasenotes.py
 
 
+2024-03-31
+==========
+
+* :vytask:`T6186` ``(bug): Fix regression in 'set system image default-boot'``
+* :vytask:`T5832` ``(feature): Keepalived: Allow using the 'dev' statement on excluded-addresses``
+
+
+2024-03-28
+==========
+
+* :vytask:`T6147` ``(bug): Conntrack not working as expected with global state-policy``
+* :vytask:`T6175` ``(bug): op-mode: "renew dhcp interface <name>" does not check if it's an actual DHCP interface``
+* :vytask:`T5872` ``(default): ipsec remote access VPN: support dhcp-interface``
+
+
+2024-03-26
+==========
+
+* :vytask:`T6066` ``(bug): Setting same network in different ospf area will raise exception``
+
+
 2024-03-25
 ==========
 
diff --git a/docs/changelog/1.5.rst b/docs/changelog/1.5.rst
index 0977e4ee..a24c3c82 100644
--- a/docs/changelog/1.5.rst
+++ b/docs/changelog/1.5.rst
@@ -8,6 +8,33 @@
    _ext/releasenotes.py
 
 
+2024-03-31
+==========
+
+* :vytask:`T6186` ``(bug): Fix regression in 'set system image default-boot'``
+* :vytask:`T5832` ``(feature): Keepalived: Allow using the 'dev' statement on excluded-addresses``
+
+
+2024-03-29
+==========
+
+* :vytask:`T6159` ``(bug): Openvpn Server Op-cmd adds heading "OpenVPN status on vtunx" for every client connection``
+
+
+2024-03-28
+==========
+
+* :vytask:`T6147` ``(bug): Conntrack not working as expected with global state-policy``
+* :vytask:`T6175` ``(bug): op-mode: "renew dhcp interface <name>" does not check if it's an actual DHCP interface``
+* :vytask:`T6102` ``(bug): Clear dhcp-server lease throws python exception on 1.5-rolling``
+
+
+2024-03-26
+==========
+
+* :vytask:`T6066` ``(bug): Setting same network in different ospf area will raise exception``
+
+
 2024-03-25
 ==========
 
-- 
cgit v1.2.3