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

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

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index aaa98de5..e02a722a 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit aaa98de536cb1b9d6ab5a18341a56543b5b57ce1
+Subproject commit e02a722a3e95696d83abf7fe78893fbb67f40ad3
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index b22ef55f..d9169d5e 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,18 @@
    _ext/releasenotes.py
 
 
+2023-05-12
+==========
+
+* :vytask:`T2769` ``(feature): Add VRF support for syslog``
+
+
+2023-05-08
+==========
+
+* :vytask:`T5212` ``(bug): snmp community name -error with special carracter``
+
+
 2023-04-27
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 6f406c00..4c2cce25 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,27 @@
    _ext/releasenotes.py
 
 
+2023-05-12
+==========
+
+* :vytask:`T2778` ``(feature): Migrate "system syslog" to get_config_dict() to support new features``
+* :vytask:`T2769` ``(feature): Add VRF support for syslog``
+
+
+2023-05-10
+==========
+
+* :vytask:`T5209` ``(bug): dhclient load-balancing exit hook 04-dhcp-wanlb returned non-zero exit status``
+* :vytask:`T5065` ``(bug): Mixing `destination port xxx` and `destination group port-group yyy` in firewall rules doesn't work, but can be commited``
+* :vytask:`T5060` ``(feature): add a VRRP 'maintenance mode'``
+
+
+2023-05-09
+==========
+
+* :vytask:`T5202` ``(bug): After removal load-balancing a pid remained which used in dhclient-exit-hooks``
+
+
 2023-05-06
 ==========
 
-- 
cgit v1.2.3