From 1b85f502d7aeff72542bf17687a2956d8d32c4cc Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 22 Mar 2021 06:24:45 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 34 +++++++++++++++++++++++++++++++---
 docs/changelog/1.4.rst | 47 ++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 76 insertions(+), 7 deletions(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index e7edd922..d2bf3bc3 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit e7edd9229dd6b870f892e419ffc671d4873a5540
+Subproject commit d2bf3bc3bd12f854cfa2ad8bdf5980e2cd6a90b9
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 0ff52067..fb1c0fe4 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,11 +8,39 @@
    _ext/releasenotes.py
 
 
-2021-03-14
+2021-03-21
+==========
+
+* :vytask:`T3416` (bug): NTP: when running inside a VRF op-mode commands do not work
+
+
+2021-03-20
 ==========
 
 * :vytask:`T3395` (bug): WAN load-balancing fails with nexthop dhcp
-* :vytask:`T3289` (bug): No description for node "service" conf-mode
+* :vytask:`T3392` (bug): vrrp over dhcp default route bug (unexpected vrf)
+* :vytask:`T3373` (feature): Upgrade to SaltStack version 3002.5
+* :vytask:`T3329` (default): "system conntrack ignore" rules can no longer be created due to an iptables syntax change
+* :vytask:`T3300` (feature): Add DHCP default route distance
+* :vytask:`T3306` (feature): Extend set route-map aggregator as to 4 Bytes 
+
+
+2021-03-18
+==========
+
+* :vytask:`T3411` (default): Extend the redirect_stdout context manager in vyos-configd to redirect stdout from subprocesses
+* :vytask:`T3271` (bug): qemu-kvm grub issue
+
+
+2021-03-17
+==========
+
+* :vytask:`T3413` (bug): Configuring invalid IPv6 EUI64 address results in "OSError: illegal IP address string passed to inet_pton"
+
+
+2021-03-14
+==========
+
 * :vytask:`T2271` (feature): OSPF: add per VRF instance support
 * :vytask:`T175` (feature): Add source route option to vti interface
 
@@ -145,7 +173,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.105 / 5.10.23
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.106 / 5.10.24
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 02981ab6..b4c333ad 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,11 +8,52 @@
    _ext/releasenotes.py
 
 
-2021-03-14
+2021-03-21
+==========
+
+* :vytask:`T3417` (default): ISIS: provide per VRF instance support
+* :vytask:`T3416` (bug): NTP: when running inside a VRF op-mode commands do not work
+
+
+2021-03-20
 ==========
 
 * :vytask:`T3395` (bug): WAN load-balancing fails with nexthop dhcp
-* :vytask:`T3289` (bug): No description for node "service" conf-mode
+* :vytask:`T3392` (bug): vrrp over dhcp default route bug (unexpected vrf)
+* :vytask:`T3373` (feature): Upgrade to SaltStack version 3002.5
+* :vytask:`T3329` (default): "system conntrack ignore" rules can no longer be created due to an iptables syntax change
+* :vytask:`T3300` (feature): Add DHCP default route distance
+* :vytask:`T3306` (feature): Extend set route-map aggregator as to 4 Bytes 
+
+
+2021-03-18
+==========
+
+* :vytask:`T3411` (default): Extend the redirect_stdout context manager in vyos-configd to redirect stdout from subprocesses
+* :vytask:`T3271` (bug): qemu-kvm grub issue
+
+
+2021-03-17
+==========
+
+* :vytask:`T3413` (bug): Configuring invalid IPv6 EUI64 address results in "OSError: illegal IP address string passed to inet_pton"
+
+
+2021-03-16
+==========
+
+* :vytask:`T3302` (default): Make vyos-configd relay stdout from scripts to the user's console
+
+
+2021-03-15
+==========
+
+* :vytask:`T3354` (default): Convert strip-private script from Perl to Python
+
+
+2021-03-14
+==========
+
 * :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
@@ -135,7 +176,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.105 / 5.10.23
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.106 / 5.10.24
 
 
 2021-02-15
-- 
cgit v1.2.3