From 5bb03eff73b19074041d6a92408a25fd7ef15681 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 22 May 2023 06:05:24 +0000
Subject: Github: update current branch

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

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index e02a722a..d2681ea5 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit e02a722a3e95696d83abf7fe78893fbb67f40ad3
+Subproject commit d2681ea5929e7c3272ac74c8e565922db402758b
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index d9169d5e..a6b361db 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,12 @@
    _ext/releasenotes.py
 
 
+2023-05-19
+==========
+
+* :vytask:`T5186` ``(bug): QoS test cannot pass for 1.3``
+
+
 2023-05-12
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 4c2cce25..a41aad95 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,33 @@
    _ext/releasenotes.py
 
 
+2023-05-21
+==========
+
+* :vytask:`T4733` ``(default): Feature Request: dhcp server: add VRF support``
+* :vytask:`T5218` ``(enhancment): Revise vyos xml lib for bug fixes and extensions``
+
+
+2023-05-17
+==========
+
+* :vytask:`T5226` ``(default): Deduplicate and standardize validators and constraints for hostname and IP address``
+* :vytask:`T5225` ``(bug): BGP allowas-in unusable``
+* :vytask:`T5208` ``(bug): Failed to start nvmf-autoconnect.service during the boot``
+
+
+2023-05-16
+==========
+
+* :vytask:`T5194` ``(default): Add reference tree to vyos1x-config``
+
+
+2023-05-15
+==========
+
+* :vytask:`T3896` ``(feature): Extend ocserv support to allow for per-group configs``
+
+
 2023-05-12
 ==========
 
-- 
cgit v1.2.3