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

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 12 ++++++++++++
 docs/changelog/1.4.rst | 40 ++++++++++++++++++++++++++++++++++------
 docs/changelog/1.5.rst | 45 ++++++++++++++++++++++++++++++++++++++-------
 4 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 2208c846..f980f8b8 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 2208c846d6bffeecac99afa7ebc3eda5c467aebc
+Subproject commit f980f8b8010a9681c387d47c476254c89b0c4a25
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 97874b7b..dc1b4620 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,18 @@
    _ext/releasenotes.py
 
 
+2024-04-25
+==========
+
+* :vytask:`T6249` ``(default): ISO builder fails because of changed buster-backport repository``
+
+
+2024-04-23
+==========
+
+* :vytask:`T6261` ``(default): Typo in op_mode connect_disconnect print statement for check_ppp_running``
+
+
 2024-04-17
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index a92eda45..0ad129e1 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,40 @@
    _ext/releasenotes.py
 
 
+2024-04-25
+==========
+
+* :vytask:`T6263` ``(bug): Multicast: Could not commit multicast config with multicast join group using source-address``
+* :vytask:`T5833` ``(bug): Not all AFIs compatible with VRF``
+
+
+2024-04-24
+==========
+
+* :vytask:`T6255` ``(bug): Static table description should not contain white-space``
+* :vytask:`T6226` ``(feature): add HAPROXY `tcp-request content accept` related block to load-balancing reverse proxy config``
+* :vytask:`T6109` ``(bug): remote syslog do not get all the logs``
+* :vytask:`T6217` ``(feature): VRRP contrack-sync script change name of the logger``
+* :vytask:`T6244` ``(feature): Spacing of "Show System Uptime" hard to parse``
+
+
+2024-04-23
+==========
+
+* :vytask:`T6260` ``(bug): image-tools: remove failed image directory if 'No space left on device' error``
+* :vytask:`T6261` ``(default): Typo in op_mode connect_disconnect print statement for check_ppp_running``
+* :vytask:`T6237` ``(feature): IPSec remote access VPN: ability to set EAP ID of clients``
+
+
+2024-04-22
+==========
+
+* :vytask:`T5996` ``(bug): unescape backslashes for config save, compare commands``
+* :vytask:`T6103` ``(bug): DHCP-server bootfile-name double slash syntax weird behaviour``
+* :vytask:`T6080` ``(default): Default NTP server settings``
+* :vytask:`T5986` ``(bug): Container: Error on commit when environment variable value contains \n line break``
+
+
 2024-04-21
 ==========
 
@@ -30,12 +64,6 @@
 * :vytask:`T6242` ``(feature): Loadbalancer reverse-proxy: SSL backend skip CA certificate verification``
 
 
-2024-04-18
-==========
-
-* :vytask:`T6245` ``(bug): Show openvpn server fails sometime``
-
-
 2024-04-17
 ==========
 
diff --git a/docs/changelog/1.5.rst b/docs/changelog/1.5.rst
index ce3dfff9..94d7b9ab 100644
--- a/docs/changelog/1.5.rst
+++ b/docs/changelog/1.5.rst
@@ -8,6 +8,44 @@
    _ext/releasenotes.py
 
 
+2024-04-26
+==========
+
+* :vytask:`T6259` ``(feature): PKI: Support RFC822 (email) names in SAN``
+
+
+2024-04-25
+==========
+
+* :vytask:`T6263` ``(bug): Multicast: Could not commit multicast config with multicast join group using source-address``
+* :vytask:`T5833` ``(bug): Not all AFIs compatible with VRF``
+
+
+2024-04-24
+==========
+
+* :vytask:`T6255` ``(bug): Static table description should not contain white-space``
+* :vytask:`T6226` ``(feature): add HAPROXY `tcp-request content accept` related block to load-balancing reverse proxy config``
+* :vytask:`T6109` ``(bug): remote syslog do not get all the logs``
+* :vytask:`T6262` ``(default): Update the boot splash for VyOS 1.5 ISO``
+* :vytask:`T6217` ``(feature): VRRP contrack-sync script change name of the logger``
+* :vytask:`T6244` ``(feature): Spacing of "Show System Uptime" hard to parse``
+
+
+2024-04-23
+==========
+
+* :vytask:`T6260` ``(bug): image-tools: remove failed image directory if 'No space left on device' error``
+* :vytask:`T6261` ``(default): Typo in op_mode connect_disconnect print statement for check_ppp_running``
+* :vytask:`T6237` ``(feature): IPSec remote access VPN: ability to set EAP ID of clients``
+
+
+2024-04-22
+==========
+
+* :vytask:`T5996` ``(bug): unescape backslashes for config save, compare commands``
+
+
 2024-04-21
 ==========
 
@@ -30,12 +68,6 @@
 * :vytask:`T6242` ``(feature): Loadbalancer reverse-proxy: SSL backend skip CA certificate verification``
 
 
-2024-04-18
-==========
-
-* :vytask:`T6245` ``(bug): Show openvpn server fails sometime``
-
-
 2024-04-17
 ==========
 
@@ -104,7 +136,6 @@
 * :vytask:`T6106` ``(bug): Valid commit error for route-reflector-client option defined in peer-group``
 * :vytask:`T5750` ``(bug): Upgrade from 1.3.4 to 1.4 Rolling fails QoS``
 * :vytask:`T5740` ``(bug): Generate wiregurad keys via HTTP-API fails``
-* :vytask:`T6206` ``(bug): L2tp smoketest fails if vyos-configd is running``
 * :vytask:`T5858` ``(bug): Show conntrack statistics formatting is all over the place``
 
 
-- 
cgit v1.2.3