From 6e8218bcc283d56c9defb3126597dec366ded725 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 15 Mar 2021 06:19:07 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 41 ++++++++++++++++++++++++++++++++++++++++-
 docs/changelog/1.4.rst | 40 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 80 insertions(+), 3 deletions(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 87bbe751..e7edd922 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 87bbe75152e3e0625776587c1fd4cd7104319fe1
+Subproject commit e7edd9229dd6b870f892e419ffc671d4873a5540
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 0be13568..0ff52067 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,45 @@
    _ext/releasenotes.py
 
 
+2021-03-14
+==========
+
+* :vytask:`T3395` (bug): WAN load-balancing fails with nexthop dhcp
+* :vytask:`T3289` (bug): No description for node "service" conf-mode
+* :vytask:`T2271` (feature): OSPF: add per VRF instance support
+* :vytask:`T175` (feature): Add source route option to vti interface
+
+
+2021-03-13
+==========
+
+* :vytask:`T3406` (bug): tunnel: interface no longer supports specifying encaplimit none - or migrator is missing
+* :vytask:`T3407` (bug): console-server: do not allow to spawn a console-server session on serial port used by "system console"
+
+
+2021-03-11
+==========
+
+* :vytask:`T3399` (bug): RPKI: dashes in hostnames are replaced with underscores when rendering the FRR config
+* :vytask:`T3305` (bug): Ingress qdisc does not work anymore in 1.3-rolling-202101 snapshot
+* :vytask:`T2927` (bug): isc-dhcpd release and expiry events never execute
+* :vytask:`T899` (bug): Tunnels cannot be moved from one bridge to another
+* :vytask:`T786` (feature): new style xml and conf-mode scripts: posibillity to add tagNode value as parameter to conf-script
+
+
+2021-03-09
+==========
+
+* :vytask:`T3389` (default): gretap tunnel type missing from vyos documentation after renamed from gre-bridge
+* :vytask:`T3382` (bug): Error creating Console Server
+
+
+2021-03-08
+==========
+
+* :vytask:`T3387` (bug): Command "Monitor vpn ipsec"  is not working
+
+
 2021-03-07
 ==========
 
@@ -106,7 +145,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.102 / 5.10.20
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.105 / 5.10.23
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 73632405..02981ab6 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,44 @@
    _ext/releasenotes.py
 
 
+2021-03-14
+==========
+
+* :vytask:`T3395` (bug): WAN load-balancing fails with nexthop dhcp
+* :vytask:`T3289` (bug): No description for node "service" conf-mode
+* :vytask:`T3345` (default): BGP: add per VRF instance support
+* :vytask:`T3344` (default): Per VRF dynamic routing support
+* :vytask:`T3325` (bug): Bgp listen-range wrong commit message
+* :vytask:`T1513` (default): Move OSPF and RIP interface configuration under protocols
+
+
+2021-03-13
+==========
+
+* :vytask:`T3406` (bug): tunnel: interface no longer supports specifying encaplimit none - or migrator is missing
+* :vytask:`T3407` (bug): console-server: do not allow to spawn a console-server session on serial port used by "system console"
+
+
+2021-03-11
+==========
+
+* :vytask:`T3305` (bug): Ingress qdisc does not work anymore in 1.3-rolling-202101 snapshot
+* :vytask:`T2927` (bug): isc-dhcpd release and expiry events never execute
+
+
+2021-03-09
+==========
+
+* :vytask:`T3389` (default): gretap tunnel type missing from vyos documentation after renamed from gre-bridge
+* :vytask:`T3382` (bug): Error creating Console Server
+
+
+2021-03-08
+==========
+
+* :vytask:`T3387` (bug): Command "Monitor vpn ipsec"  is not working
+
+
 2021-03-07
 ==========
 
@@ -97,7 +135,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.102 / 5.10.20
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.105 / 5.10.23
 
 
 2021-02-15
-- 
cgit v1.2.3