From 873a671d84ccc0203036d4dfed9555640bb3960c Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 11 Sep 2023 06:05:30 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 34 ++++++++++++++++++++++++++
 docs/changelog/1.4.rst | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index bbcf94bb..6c3defcc 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit bbcf94bba674e4c001d9439439b8fd405f39501a
+Subproject commit 6c3defcc1e5e89cd2c031fdaa0975737529d7d5f
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 1c90609b..52b7d2f3 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,40 @@
    _ext/releasenotes.py
 
 
+2023-09-11
+==========
+
+* :vytask:`T5557` ``(bug): bgp: Use treat-as-withdraw for tunnel encapsulation attribute CVE-2023-38802``
+* :vytask:`T3424` ``(default): PPPoE IA-PD doesn't work in VRF``
+
+
+2023-09-10
+==========
+
+* :vytask:`T5555` ``(bug): Fix timezone migrator (system 13-to-14)``
+* :vytask:`T5545` ``(bug): sflow is not working``
+
+
+2023-09-08
+==========
+
+* :vytask:`T4426` ``(default): Add arpwatch to the image``
+
+
+2023-09-05
+==========
+
+* :vytask:`T5524` ``(feature): Add config directory to liveCD``
+* :vytask:`T2958` ``(bug): DHCP server doesn't work from a live CD``
+* :vytask:`T5428` ``(bug): dhcp: client renewal fails when running inside VRF``
+
+
+2023-09-04
+==========
+
+* :vytask:`T5506` ``(bug): Container bridge interfaces do not have a link-local address``
+
+
 2023-08-31
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 64902a9c..f99c72bb 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,72 @@
    _ext/releasenotes.py
 
 
+2023-09-11
+==========
+
+* :vytask:`T3424` ``(default): PPPoE IA-PD doesn't work in VRF``
+* :vytask:`T2773` ``(feature): EIGRP support for VRF``
+
+
+2023-09-10
+==========
+
+* :vytask:`T5565` ``(bug): Builds as vyos-999-timestamp instead of vyos-1.4-rolling-timestamp``
+* :vytask:`T5555` ``(bug): Fix timezone migrator (system 13-to-14)``
+* :vytask:`T5529` ``(bug): Missing symbolic link in linux-firmware package.``
+
+
+2023-09-09
+==========
+
+* :vytask:`T5540` ``(bug): vyos-1x: Wrong VHT configuration for WiFi 802.11ac``
+* :vytask:`T5423` ``(bug): ipsec: no output for op-cmd "show vpn ike secrets"``
+* :vytask:`T3700` ``(feature): Support VLAN tunnel mapping of VLAN aware bridges``
+
+
+2023-09-08
+==========
+
+* :vytask:`T5502` ``(bug): Firewall - wrong parser for inbound and/or outbound interface``
+* :vytask:`T5460` ``(feature): Firewall - remove config-trap``
+* :vytask:`T5450` ``(feature): Firewall interface group - Allow inverted matcher``
+* :vytask:`T4426` ``(default): Add arpwatch to the image``
+* :vytask:`T4356` ``(bug): DHCP v6 client only supports single interface configuration``
+
+
+2023-09-07
+==========
+
+* :vytask:`T5489` ``(feature): Change to BBR as TCP congestion control, or at least make it an config option``
+* :vytask:`T5510` ``(feature): Shrink imagesize and improve read performance by changing mksquashfs syntax``
+
+
+2023-09-06
+==========
+
+* :vytask:`T5542` ``(bug): ipoe-server: external-dhcp(dhcp-relay) not woking / not implemented``
+* :vytask:`T5548` ``(bug): HAProxy renders timeouts incorrectly``
+* :vytask:`T5544` ``(feature): Allow CAP_SYS_MODULE to be set on containers``
+
+
+2023-09-05
+==========
+
+* :vytask:`T5524` ``(feature): Add config directory to liveCD``
+* :vytask:`T5519` ``(bug): Function `call` sometimes hangs``
+* :vytask:`T5508` ``(bug): Configuration Migration Fails to New Netfilter Firewall Syntax``
+* :vytask:`T5495` ``(feature): Enable snmp module also for frr/ldpd``
+* :vytask:`T2958` ``(bug): DHCP server doesn't work from a live CD``
+* :vytask:`T5428` ``(bug): dhcp: client renewal fails when running inside VRF``
+
+
+2023-09-04
+==========
+
+* :vytask:`T5536` ``(bug): show dhcp client leases caues No module named 'vyos.validate'``
+* :vytask:`T5506` ``(bug): Container bridge interfaces do not have a link-local address``
+
+
 2023-09-03
 ==========
 
-- 
cgit v1.2.3