From 3ba047addb8d38f93c8fffa2ea4de9207001c27f Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 8 Mar 2021 06:18:54 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 35 +++++++++++++++++++++++++++++++++--
 docs/changelog/1.4.rst | 22 ++++++++++++++++++++--
 3 files changed, 54 insertions(+), 5 deletions(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 49bc3f1e..87bbe751 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 49bc3f1e3ff8416908fc986bb60b444a75a1722d
+Subproject commit 87bbe75152e3e0625776587c1fd4cd7104319fe1
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index c819323f..0be13568 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,38 @@
    _ext/releasenotes.py
 
 
+2021-03-07
+==========
+
+* :vytask:`T3319` (bug): VXLAN uses ttl 1 (auto) by default
+* :vytask:`T3391` (feature): Add CLI support for specifying maximum-paths per address family ipv4 unicast and ipv6 unicast
+* :vytask:`T3211` (feature): ability to redistribute ISIS into other routing protocols
+
+
+2021-03-05
+==========
+
+* :vytask:`T2659` (feature): Add fastnetmon (DDoS detection) support
+
+
+2021-03-04
+==========
+
+* :vytask:`T2861` (bug): route-map "set community additive" not working correctly
+
+
+2021-03-03
+==========
+
+* :vytask:`T2966` (feature): tunnel: add new encapsulation types ip6tnl and ip6gretap
+
+
+2021-03-01
+==========
+
+* :vytask:`T3342` (bug): On xen-netback interfaces must set "scattergather" offload before MTU>1500
+
+
 2021-02-28
 ==========
 
@@ -20,7 +52,6 @@
 
 * :vytask:`T2291` (bug): Bad hostnames in /etc/hosts with static-mapping in dhcp server config
 * :vytask:`T3364` (feature): tunnel: cleanup/rename CLI nodes
-* :vytask:`T3211` (feature): ability to redistribute ISIS into other routing protocols
 * :vytask:`T3368` (feature): macsec: add support for gcm-aes-256 cipher
 * :vytask:`T3366` (bug): tunnel: can not change local / remote ip address for gre-bridge tunnel
 
@@ -75,7 +106,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.101 / 5.10.19
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.102 / 5.10.20
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 618664f8..73632405 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,25 @@
    _ext/releasenotes.py
 
 
+2021-03-07
+==========
+
+* :vytask:`T3388` (bug): show interfaces doesn't display pppoeX
+* :vytask:`T3211` (feature): ability to redistribute ISIS into other routing protocols
+
+
+2021-03-04
+==========
+
+* :vytask:`T3377` (bug): show interfaces throws error
+
+
+2021-03-02
+==========
+
+* :vytask:`T3375` (bug): Interface becomes up at boot even when disabled
+
+
 2021-02-28
 ==========
 
@@ -22,7 +41,6 @@
 
 * :vytask:`T3365` (bug): Bgp neighbor interface ordering for remote-as
 * :vytask:`T3225` (bug): Adding a BGP neighbor with an address on a local interface throws a vyos.frr.CommitError: Configuration FRR failed while committing code: ''
-* :vytask:`T3211` (feature): ability to redistribute ISIS into other routing protocols
 * :vytask:`T3368` (feature): macsec: add support for gcm-aes-256 cipher
 * :vytask:`T3173` (feature): Need 'nopmtudisc' option for tunnel interface
 
@@ -79,7 +97,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.101 / 5.10.19
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.102 / 5.10.20
 
 
 2021-02-15
-- 
cgit v1.2.3