From b089f1b2d8a9093f33812b42dd53545d3dc73eeb Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 2 Oct 2023 06:05:37 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst |  9 +++++++--
 docs/changelog/1.4.rst | 33 ++++++++++++++++++++++++++++++++-
 docs/changelog/1.5.rst |  7 +++++++
 4 files changed, 47 insertions(+), 4 deletions(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 90ce099f..f6a87a32 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 90ce099f065325841c4c18b4a4beadaf141a35b2
+Subproject commit f6a87a32d61c0f9928824b2426da3c8510a4f111
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index ef74b249..5765f78b 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,12 @@
    _ext/releasenotes.py
 
 
+2023-09-25
+==========
+
+* :vytask:`T5533` ``(bug): Keepalived VRRP IPv6 group enters in FAULT state``
+
+
 2023-09-20
 ==========
 
@@ -57,7 +63,7 @@
 * :vytask:`T4874` ``(default): Add Warning message to Equuleus``
 * :vytask:`T4855` ``(bug): Trying to create more than one tunnel of the same type to the same address causes unhandled exception``
 * :vytask:`T4776` ``(bug): NVME storage is not detected properly during installation``
-* :vytask:`T3546` ``(feature): Add pppoe-server CLI custom script feature``
+* :vytask:`T3546` ``(feature): Add support for running scripts on PPPoE server session events``
 * :vytask:`T738` ``(feature): Add local-port and resolver port options for powerdns in CLI configuration tree``
 
 
@@ -83,7 +89,6 @@
 * :vytask:`T3940` ``(bug): DHCP client does not remove IP address when stopped by the 02-vyos-stopdhclient hook``
 * :vytask:`T3713` ``(default): Create a meta-package for user utilities``
 * :vytask:`T3339` ``(bug): Cloud-Init domain search setting not applied``
-* :vytask:`T3144` ``(feature): Support op-mode command to release DHCP leases``
 * :vytask:`T2640` ``(feature): Running VyOS inside Docker containers``
 * :vytask:`T3577` ``(bug): Generating vpn x509 key pair fails with command not found``
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 215a22e2..268bb53d 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,38 @@
    _ext/releasenotes.py
 
 
+2023-10-01
+==========
+
+* :vytask:`T936` ``(feature): Reimplementation of tech-support diagnostic file generation``
+
+
+2023-09-30
+==========
+
+* :vytask:`T5048` ``(bug): QoS doesn't work correctly root task``
+* :vytask:`T4989` ``(bug): QoS Policy Limiter - classes for marked traffic do not work``
+
+
+2023-09-28
+==========
+
+* :vytask:`T5596` ``(feature): bgp: add new features from FRR 9``
+* :vytask:`T5412` ``(feature): Add support for extending config-mode dependencies in supplemental package``
+
+
+2023-09-26
+==========
+
+* :vytask:`T5480` ``(bug): Ability to disable SNMP for VRRP keepalived service``
+
+
+2023-09-25
+==========
+
+* :vytask:`T5533` ``(bug): Keepalived VRRP IPv6 group enters in FAULT state``
+
+
 2023-09-24
 ==========
 
@@ -270,7 +302,6 @@
 * :vytask:`T5461` ``(feature): Improve rootfs directory variable``
 * :vytask:`T5457` ``(feature): Add environmental variable pointing to current rootfs directory``
 * :vytask:`T5440` ``(bug): Restore pre/postconfig scripts if user deleted them``
-* :vytask:`T5436` ``(bug): vyos-preconfig-bootup.script is missing``
 
 
 2023-08-12
diff --git a/docs/changelog/1.5.rst b/docs/changelog/1.5.rst
index 1d4333f7..323f3756 100644
--- a/docs/changelog/1.5.rst
+++ b/docs/changelog/1.5.rst
@@ -8,6 +8,13 @@
    _ext/releasenotes.py
 
 
+2023-09-28
+==========
+
+* :vytask:`T5596` ``(feature): bgp: add new features from FRR 9``
+* :vytask:`T5412` ``(feature): Add support for extending config-mode dependencies in supplemental package``
+
+
 2023-09-24
 ==========
 
-- 
cgit v1.2.3