From d700ad173cdd04c38aaadf0789d38e88207a03f9 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 27 Mar 2023 06:05:51 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst |  6 ++++++
 docs/changelog/1.4.rst | 30 +++++++++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index c820be57..8f1e8d72 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit c820be57b6c77cdb0a5055d0c3a77dc8d550e2d7
+Subproject commit 8f1e8d720d63dffa2b5a3413c8827c9ad176f2ac
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 786ab1ba..82bceca4 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,12 @@
    _ext/releasenotes.py
 
 
+2023-03-21
+==========
+
+* :vytask:`T5098` (feature): PPPoE client holdoff configuration
+
+
 2023-03-19
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 53d3a563..014afd23 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,35 @@
    _ext/releasenotes.py
 
 
+2023-03-23
+==========
+
+* :vytask:`T5108` (feature): Get rate limit for L2TP/PPTP/SSTP/IPoE in raw format
+* :vytask:`T5086` (feature): Integrate hsflowd for sflow accounting
+* :vytask:`T5107` (bug): Raise error in op-mode dns.py instead of calling exit
+
+
+2023-03-22
+==========
+
+* :vytask:`T5068` (feature): Generate op-mode API client requests along with schema generation
+
+
+2023-03-21
+==========
+
+* :vytask:`T5098` (feature): PPPoE client holdoff configuration
+* :vytask:`T3694` (bug): Static routes not installed into kernel nor frr
+* :vytask:`T5102` (feature): ospf: "redistribute babel" is always set
+
+
+2023-03-20
+==========
+
+* :vytask:`T5057` (bug): IPoE server incorrect interface regex
+* :vytask:`T5095` (feature): Return list instead of dict for 'raw' output of op-mode openvpn
+
+
 2023-03-19
 ==========
 
@@ -2226,7 +2255,6 @@
 
 * :vytask:`T3612` (bug): IPoE Server address pool issues. 
 * :vytask:`T3995` (feature): OpenVPN: do not stop/start service on configuration change
-* :vytask:`T3680` (bug): Static routes with dhcp-interface are flaky
 * :vytask:`T4008` (feature): dhcp: change client retry interval form 300 -> 60 seconds
 * :vytask:`T3795` (bug): WWAN: issues with non connected interface / no signal
 * :vytask:`T3510` (bug): RADIUS usersname is not shown on CLI
-- 
cgit v1.2.3