From 5b574796879a1fb72e674407085cefa2d98101f2 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 22 Feb 2021 06:18:26 +0000
Subject: Github: update current branch

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

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 96656b1a..cf1156a6 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 96656b1a7bb7166c923a45d1333d7e7c7add5514
+Subproject commit cf1156a60e1d03a752cde0baadbc9ac8118b2a52
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 4358b4b3..f54a7a3e 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,45 @@
    _ext/releasenotes.py
 
 
+2021-02-21
+==========
+
+* :vytask:`T3163` (feature): ethernet ring-buffer can be set with an invalid value
+* :vytask:`T2521` (bug): Need to restart pdns-recursor to check new entries in /etc/hosts
+
+
+2021-02-20
+==========
+
+* :vytask:`T2647` (default): ipsec disableuniqreqids generate a wrong ipsec.conf
+
+
+2021-02-19
+==========
+
+* :vytask:`T3326` (bug): OSPFv3: Cannot add L2TPv3 interface
+* :vytask:`T2061` (bug): protocol logs not sent to remote syslog
+
+
+2021-02-18
+==========
+
+* :vytask:`T3259` (default): many dnat rules makes the vyos http api crash, even showConfig op timeouts
+
+
+2021-02-17
+==========
+
+* :vytask:`T3047` (bug): OSPF : virtual-link and passive-interface default parameters does not work together
+* :vytask:`T3312` (feature): SolarFlare NICs support
+
+
+2021-02-16
+==========
+
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.99 / 5.10.17
+
+
 2021-02-14
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 273f5c68..96d80b26 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,40 @@
    _ext/releasenotes.py
 
 
+2021-02-21
+==========
+
+* :vytask:`T3331` (bug): Bgp unsuppress-map should be as "value leafNode"
+* :vytask:`T3330` (bug): Bgp capability orf prefix-list fail
+* :vytask:`T3163` (feature): ethernet ring-buffer can be set with an invalid value
+
+
+2021-02-19
+==========
+
+* :vytask:`T3326` (bug): OSPFv3: Cannot add L2TPv3 interface
+* :vytask:`T3332` (bug): BGP unnumbered - UnboundLocalError: local variable 'peer_group' referenced before assignment
+
+
+2021-02-18
+==========
+
+* :vytask:`T3259` (default): many dnat rules makes the vyos http api crash, even showConfig op timeouts
+
+
+2021-02-17
+==========
+
+* :vytask:`T3312` (feature): SolarFlare NICs support
+
+
+2021-02-16
+==========
+
+* :vytask:`T3313` (bug): ospfv3 interface missing options
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.99 / 5.10.17
+
+
 2021-02-15
 ==========
 
-- 
cgit v1.2.3