From 8317806793c0f4b8434c0669676e7deddcbc431c Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 1 May 2023 06:05:32 +0000
Subject: Github: update current branch

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

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index a2b2241e..0f224ec0 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit a2b2241e4ac045f3aa790f0051d5699b04b78dbd
+Subproject commit 0f224ec009aed6184691da49b8aba5a53b162770
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 9a81d5e2..b22ef55f 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,13 @@
    _ext/releasenotes.py
 
 
+2023-04-27
+==========
+
+* :vytask:`T5175` ``(bug): http-api: error in MultiPart parser for FastAPI version >= 0.91.0``
+* :vytask:`T5176` ``(bug): http-api: update vyos-http-api-tools for FastAPI security vulnerability``
+
+
 2023-04-13
 ==========
 
@@ -125,6 +132,12 @@
 * :vytask:`T4743` ``(feature): Enable IPv6 address for Dynamic DNS``
 
 
+2023-02-16
+==========
+
+* :vytask:`T4971` ``(feature): Radius attribute "Framed-Pool" for PPPoE``
+
+
 2023-02-15
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 8949b217..55605b8b 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,28 @@
    _ext/releasenotes.py
 
 
+2023-04-27
+==========
+
+* :vytask:`T5185` ``(bug): Static IPv6 route with blackhole fails``
+* :vytask:`T5175` ``(bug): http-api: error in MultiPart parser for FastAPI version >= 0.91.0``
+* :vytask:`T5183` ``(bug): IPv6 route6 problem``
+* :vytask:`T5181` ``(bug): Wrong dependencies or priorities for zebra vni vrf interfaces and bgpd``
+* :vytask:`T5128` ``(feature): Policy route - Allow wildcard interfaces``
+* :vytask:`T5055` ``(feature): Firewall - Add packet type matcher (pkttype)``
+* :vytask:`T5050` ``(feature): Firewall - Add options for logging packets``
+* :vytask:`T5037` ``(feature): Firewall - Add queue action``
+* :vytask:`T5176` ``(bug): http-api: update vyos-http-api-tools for FastAPI security vulnerability``
+* :vytask:`T5174` ``(bug): vrf: ensure no duplicate VNIs can be created``
+* :vytask:`T5123` ``(default): Display route originator in show ospf table command``
+
+
+2023-04-25
+==========
+
+* :vytask:`T5179` ``(bug): multi nodes defined in XML are not properly represented as list in get_config_dict()``
+
+
 2023-04-17
 ==========
 
@@ -92,7 +114,6 @@
 2023-04-01
 ==========
 
-* :vytask:`T5082` ``(feature): container: switch to netavark network stack``
 * :vytask:`T5047` ``(bug): Recreate only a specific container``
 * :vytask:`T5132` ``(default): Operational command "show isis vrf  XXX route | neighbord" aren't working``
 
-- 
cgit v1.2.3