From 18399d9cff9e80281a11a14b7718e1bed37018ac Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 29 Nov 2021 06:20:59 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 33 ++++++++++++++++++++++++++++++++-
 docs/changelog/1.4.rst | 43 ++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 22e35588..b675c8b6 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 22e3558834784a8ca37f6335c15c58a631a7fe10
+Subproject commit b675c8b6187c4b77759e3f96c9c92dd382dabeae
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index b7dd1861..68d15822 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,37 @@
    _ext/releasenotes.py
 
 
+2021-11-28
+==========
+
+* :vytask:`T3999` (bug): show lldp neighbor Traceback error
+
+
+2021-11-26
+==========
+
+* :vytask:`T4019` (bug): Smoketests for SSTP and openconnect fails 
+
+
+2021-11-25
+==========
+
+* :vytask:`T4005` (feature): Feature Request: IPsec IKEv1 + IKEv2 for one peer
+
+
+2021-11-24
+==========
+
+* :vytask:`T4015` (feature): Update Accel-PPP to a newer revision
+* :vytask:`T1083` (feature): Implement persistent/random address and port mapping options for NAT rules
+
+
+2021-11-23
+==========
+
+* :vytask:`T3990` (bug): WATCHFRR: crashlog and per-thread log buffering unavailable (due to files left behind in /var/tmp/frr/ after reboot)
+
+
 2021-11-20
 ==========
 
@@ -1141,7 +1172,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.160 / 5.10.80
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.162 / 5.10.82
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 4f1a9df2..047f2a6b 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,47 @@
    _ext/releasenotes.py
 
 
+2021-11-28
+==========
+
+* :vytask:`T3999` (bug): show lldp neighbor Traceback error
+* :vytask:`T3928` (feature): Add OSPFv3 VRF support
+
+
+2021-11-27
+==========
+
+* :vytask:`T3755` (feature): ospf: adjust to new FRR 8 syntax where "no passive-interface " moved to interface section
+* :vytask:`T3753` (feature): frr: upgrade to stable/8.1 release train
+
+
+2021-11-26
+==========
+
+* :vytask:`T3978` (bug): containers add network without declaring prefix raise ConfigError
+
+
+2021-11-25
+==========
+
+* :vytask:`T4006` (default): Add additional Linux capabilities to container configuration
+* :vytask:`T3986` (bug): Incorrect description for vpn ipsec site-to-site authentication and connection
+
+
+2021-11-24
+==========
+
+* :vytask:`T4015` (feature): Update Accel-PPP to a newer revision
+* :vytask:`T3865` (bug): loadkey command help text missing escape sequence
+* :vytask:`T1083` (feature): Implement persistent/random address and port mapping options for NAT rules
+
+
+2021-11-23
+==========
+
+* :vytask:`T3990` (bug): WATCHFRR: crashlog and per-thread log buffering unavailable (due to files left behind in /var/tmp/frr/ after reboot)
+
+
 2021-11-20
 ==========
 
@@ -1290,7 +1331,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.160 / 5.10.80
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.162 / 5.10.82
 
 
 2021-02-15
-- 
cgit v1.2.3