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

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

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index cf1156a6..49bc3f1e 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit cf1156a60e1d03a752cde0baadbc9ac8118b2a52
+Subproject commit 49bc3f1e3ff8416908fc986bb60b444a75a1722d
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index f54a7a3e..c819323f 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,37 @@
    _ext/releasenotes.py
 
 
+2021-02-28
+==========
+
+* :vytask:`T3370` (bug): dhcp: Invalid domain name "private"
+* :vytask:`T3369` (feature): VXLAN: add IPv6 underlay support
+
+
+2021-02-27
+==========
+
+* :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
+
+
+2021-02-26
+==========
+
+* :vytask:`T3347` (default): vyos 1.3 beta fails to configure Xen HVM guest ethernet interfaces due to ethtool -g error
+* :vytask:`T3357` (default): HTTP-API redirect from http correct https port
+
+
+2021-02-24
+==========
+
+* :vytask:`T1774` (default): Add a show config operation to the HTTP API
+* :vytask:`T3303` (feature): Change welcome message on boot
+
+
 2021-02-21
 ==========
 
@@ -44,7 +75,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.99 / 5.10.17
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.101 / 5.10.19
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 96d80b26..618664f8 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,46 @@
    _ext/releasenotes.py
 
 
+2021-02-28
+==========
+
+* :vytask:`T3370` (bug): dhcp: Invalid domain name "private"
+* :vytask:`T3369` (feature): VXLAN: add IPv6 underlay support
+* :vytask:`T3363` (bug): VyOS-Build interactive prompt when using Podman
+* :vytask:`T3320` (bug): Bgp neighbor peer-group without peer-group fail
+
+
+2021-02-27
+==========
+
+* :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
+
+
+2021-02-26
+==========
+
+* :vytask:`T3324` (bug): Bgp space in the password
+* :vytask:`T3357` (default): HTTP-API redirect from http correct https port
+* :vytask:`T3323` (bug): Bgp ttl-security and ebgp-multihop fail
+
+
+2021-02-24
+==========
+
+* :vytask:`T3303` (feature): Change welcome message on boot
+
+
+2021-02-22
+==========
+
+* :vytask:`T3322` (bug): Bgp neighbor timers not applyed to FRR config
+* :vytask:`T3327` (bug): OSPFv3: Cannot add dummy interface
+
+
 2021-02-21
 ==========
 
@@ -39,7 +79,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.99 / 5.10.17
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.101 / 5.10.19
 
 
 2021-02-15
-- 
cgit v1.2.3