Github: update current branch

4 files changed, 159 insertions, 1 deletions

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 96f7fb69fb6ba34f15e35b4cddbb108eebda619
+Subproject 8034e76f6b8d0813ad1a447935809efcd203be4
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index b22bf02a..becdd4b3 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,24 @@
    _ext/releasenotes.py
 
 
+2024-04-12
+==========
+
+* :vytask:`T3437` ``(bug): BGP Confederation Addition Causes Error``
+
+
+2024-04-10
+==========
+
+* :vytask:`T6124` ``(bug): Docker equuleus build image doesn't build due to fpm``
+
+
+2024-04-08
+==========
+
+* :vytask:`T6196` ``(bug): Route-map and summary-only do not work in BGP aggregation at the same time``
+
+
 2024-04-07
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 8921afbe..e7927899 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,89 @@
    _ext/releasenotes.py
 
 
+2024-04-14
+==========
+
+* :vytask:`T6210` ``(feature): Add container ability to configure capability sys-nice``
+
+
+2024-04-13
+==========
+
+* :vytask:`T6173` ``(bug): Build Causes Errors When "--version" Contains Slashes ("/")``
+* :vytask:`T2518` ``(feature): Support NAT for ipv6(NPT)``
+* :vytask:`T6238` ``(default): vyos-build Check pull request title requires the python script``
+* :vytask:`T6235` ``(default): Git check PR status: conflicts and resolution``
+
+
+2024-04-12
+==========
+
+* :vytask:`T5872` ``(default): ipsec remote access VPN: support dhcp-interface``
+* :vytask:`T6216` ``(bug): Upgrade error from 1.3 to 1.4 - Firewall using character '+'``
+* :vytask:`T6214` ``(bug): Error when using some constraints``
+* :vytask:`T6213` ``(bug): Firewall group constraints``
+* :vytask:`T6148` ``(bug): Reset vpn ipsec command breaks tunnel and does not reset SAs that are down``
+* :vytask:`T1487` ``(default): DNS (pdns_recursor) stats logs not saved to disk``
+* :vytask:`T6222` ``(bug): VRRP rfc3768-compatibility not working correctly when resulting interface name is over 15 characters``
+* :vytask:`T6218` ``(bug): Container network interface in VRF fails to generate IPv6 link-local address``
+* :vytask:`T5959` ``(default): Streamline dns forwarding service``
+* :vytask:`T5846` ``(default): Refactor and simplify DUID definition in conf-mode``
+* :vytask:`T5631` ``(feature): Ability to export the current configuration in JSON format``
+* :vytask:`T5615` ``(default): Narrow down spurious name conflict with mdns``
+* :vytask:`T5530` ``(default): Add LFA to IS-IS``
+* :vytask:`T5195` ``(default): Break up the vyos.util module``
+* :vytask:`T5124` ``(bug): Python3 deprecation distutils.version import LooseVersion``
+* :vytask:`T1871` ``(feature): add MTU option when configure limiter traffic-policy``
+* :vytask:`T874` ``(feature): Support for Two Factor Authentication for CLI access via Google Authenticator/OTP``
+* :vytask:`T6204` ``(default): Remove shebang lines from Python modules``
+* :vytask:`T6166` ``(bug): Tech support generation error for custom output location``
+* :vytask:`T6062` ``(feature): container: add support for image manipulation based on tag name``
+* :vytask:`T5877` ``(default): Reduce unnecessary nesting in system domain-search path and improve smoketest``
+* :vytask:`T5871` ``(default): ipsec remote access VPN: specify "cacerts" to disambiguate mulitple remote access configurations``
+* :vytask:`T5870` ``(default): ipsec remote access VPN: add x509 ("pubkey") authentication``
+* :vytask:`T5772` ``(default): Require HTTPS API server configurations to include at least one key if key-based auth is used``
+* :vytask:`T5447` ``(feature): Allow static MACsec keys with peers``
+* :vytask:`T4221` ``(default): Add a template filter for converting scalars to single-item lists``
+* :vytask:`T3766` ``(feature): containers: Expanding options for networking and building containers``
+
+
+2024-04-11
+==========
+
+* :vytask:`T4516` ``(feature): Rewrite system image manipulation tools in Python``
+* :vytask:`T4548` ``(feature): GRUB loader configuration rework``
+* :vytask:`T3774` ``(bug): atop logs are not limited in size``
+* :vytask:`T3574` ``(default): Add constraintGroup for combining validators with logical AND``
+* :vytask:`T3474` ``(default): Revisit storing syntax version of interface definitions in XML file``
+* :vytask:`T160` ``(feature): Support NAT64``
+* :vytask:`T6228` ``(bug): Cleanup of not existing units``
+
+
+2024-04-10
+==========
+
+* :vytask:`T6207` ``(bug): image-tools: restore ability to copy config.boot.default on image install``
+* :vytask:`T5750` ``(bug): Upgrade from 1.3.4 to 1.4 Rolling fails QoS``
+* :vytask:`T5858` ``(bug): Show conntrack statistics formatting is all over the place``
+* :vytask:`T4734` ``(feature): Feature Request: openvpn: add OTP 2FA support``
+
+
+2024-04-09
+==========
+
+* :vytask:`T3409` ``(feature): Add back TCP-MSS Clamp to PMTU``
+* :vytask:`T6121` ``(feature): Extend service config-sync for sections  vpn, policy, vrf``
+
+
+2024-04-08
+==========
+
+* :vytask:`T6197` ``(bug): IPoE-server interface client-subnet looks broken or works with the wrong logic``
+* :vytask:`T6196` ``(bug): Route-map and summary-only do not work in BGP aggregation at the same time``
+* :vytask:`T6068` ``(feature): dhcp server: allow switching between load-balanced and hotspare mode``
+
+
 2024-04-07
 ==========
 
@@ -99,7 +182,6 @@
 
 * :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
diff --git a/docs/changelog/1.5.rst b/docs/changelog/1.5.rst
index 07743ba2..1eb6acd3 100644
--- a/docs/changelog/1.5.rst
+++ b/docs/changelog/1.5.rst
@@ -8,6 +8,64 @@
    _ext/releasenotes.py
 
 
+2024-04-14
+==========
+
+* :vytask:`T6210` ``(feature): Add container ability to configure capability sys-nice``
+
+
+2024-04-13
+==========
+
+* :vytask:`T6173` ``(bug): Build Causes Errors When "--version" Contains Slashes ("/")``
+* :vytask:`T2518` ``(feature): Support NAT for ipv6(NPT)``
+
+
+2024-04-12
+==========
+
+* :vytask:`T6214` ``(bug): Error when using some constraints``
+* :vytask:`T6213` ``(bug): Firewall group constraints``
+* :vytask:`T6222` ``(bug): VRRP rfc3768-compatibility not working correctly when resulting interface name is over 15 characters``
+* :vytask:`T6218` ``(bug): Container network interface in VRF fails to generate IPv6 link-local address``
+* :vytask:`T5044` ``(feature): High Availability in DHCPv6 -ISC DHCP Failover/Kea``
+* :vytask:`T6166` ``(bug): Tech support generation error for custom output location``
+* :vytask:`T344` ``(feature): Software basesd FastPath``
+
+
+2024-04-11
+==========
+
+* :vytask:`T4516` ``(feature): Rewrite system image manipulation tools in Python``
+* :vytask:`T4548` ``(feature): GRUB loader configuration rework``
+* :vytask:`T6228` ``(bug): Cleanup of not existing units``
+
+
+2024-04-10
+==========
+
+* :vytask:`T6207` ``(bug): image-tools: restore ability to copy config.boot.default on image install``
+* :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``
+
+
+2024-04-09
+==========
+
+* :vytask:`T6121` ``(feature): Extend service config-sync for sections  vpn, policy, vrf``
+
+
+2024-04-08
+==========
+
+* :vytask:`T6197` ``(bug): IPoE-server interface client-subnet looks broken or works with the wrong logic``
+* :vytask:`T6196` ``(bug): Route-map and summary-only do not work in BGP aggregation at the same time``
+* :vytask:`T6068` ``(feature): dhcp server: allow switching between load-balanced and hotspare mode``
+
+
 2024-04-07
 ==========