From 8615d1ea9ebfe97029a8c9c6dc10e29478409453 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 28 Feb 2022 06:06:07 +0000
Subject: Github: update current branch

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

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 2373b232..17602c2d 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 2373b232849c847717cbdcfac7390d8376e227ca
+Subproject commit 17602c2d63aacc972d4e2f6f21aeeded243d4fa1
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 669d670e..04f99ef2 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,19 @@
    _ext/releasenotes.py
 
 
+2022-02-24
+==========
+
+* :vytask:`T4267` (bug): Error - Missing required "ip key" parameter
+
+
+2022-02-23
+==========
+
+* :vytask:`T4264` (bug): vxlan: interface is destroyed and rebuild on description change
+* :vytask:`T4263` (bug): vyos.util.leaf_node_changed() dos not honor valueLess nodes
+
+
 2022-02-21
 ==========
 
@@ -1541,7 +1554,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.178 / 5.10.99
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.181 / 5.10.102
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 57167c39..c2a2e5d1 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,32 @@
    _ext/releasenotes.py
 
 
+2022-02-26
+==========
+
+* :vytask:`T4272` (feature): lldp: migrate Python script to use get_config_dict()
+
+
+2022-02-25
+==========
+
+* :vytask:`T4269` (feature): node.def generator should automatically add default values
+
+
+2022-02-24
+==========
+
+* :vytask:`T4267` (bug): Error - Missing required "ip key" parameter
+
+
+2022-02-23
+==========
+
+* :vytask:`T4194` (bug): prefix-list no check for duplicate entries
+* :vytask:`T4264` (bug): vxlan: interface is destroyed and rebuild on description change
+* :vytask:`T4263` (bug): vyos.util.leaf_node_changed() dos not honor valueLess nodes
+
+
 2022-02-21
 ==========
 
@@ -66,12 +92,6 @@
 * :vytask:`T3872` (feature): Add configurable telegraf monitoring service
 
 
-2022-02-10
-==========
-
-* :vytask:`T4235` (default): Add config tree diff algorithm
-
-
 2022-02-08
 ==========
 
@@ -1813,7 +1833,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.178 / 5.10.99
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.181 / 5.10.102
 
 
 2021-02-15
-- 
cgit v1.2.3