From a364090e628e39ff3978fe3a4080a5b24f9ada75 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 20 Jun 2022 06:05:20 +0000
Subject: Github: update current branch

---
 docs/changelog/1.3.rst | 14 +++++++++++++-
 docs/changelog/1.4.rst | 29 ++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

(limited to 'docs/changelog')

diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index e7e9fb38..5e59755e 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,18 @@
    _ext/releasenotes.py
 
 
+2022-06-16
+==========
+
+* :vytask:`T3866` (bug): Configs with DNS forwarding listening on OpenVPN interfaces or interfaces without a fixed address cannot be migrated to the new syntax
+
+
+2022-06-15
+==========
+
+* :vytask:`T1890` (feature): Metatask: rewrite flow-accounting to XML and Python
+
+
 2022-06-09
 ==========
 
@@ -1733,7 +1745,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.197 / 5.10.121
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.197 / 5.10.123
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 0f06b3ea..655417fb 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,9 +8,36 @@
    _ext/releasenotes.py
 
 
+2022-06-18
+==========
+
+* :vytask:`T4467` (bug): Validator Does Not Accept Signed Numbers
+
+
+2022-06-17
+==========
+
+* :vytask:`T4209` (bug): Firewall incorrect handler for recent count and time
+
+
+2022-06-16
+==========
+
+* :vytask:`T4352` (bug): wan-load balance - priority traffic rule doesn't work 
+
+
+2022-06-15
+==========
+
+* :vytask:`T4450` (feature): Route-map - Extend options for ip|ipv6 address match
+* :vytask:`T4449` (feature): Route-map - Extend options for ip next-hop match
+* :vytask:`T990` (feature): Make DNAT/SNAT a valid state in firewall rules.  
+
+
 2022-06-12
 ==========
 
+* :vytask:`T4420` (feature): Feature Request: ocserv: show configured 2FA OTP key
 * :vytask:`T4380` (default): Feature Request: ocserv: 2FA OTP key generator in VyOS CLI
 
 
@@ -2235,7 +2262,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.197 / 5.10.121
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.197 / 5.10.123
 
 
 2021-02-15
-- 
cgit v1.2.3