From ca68fdeb09303d75d3c2a9b76322152ae351be9f Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 14 Mar 2022 06:04:56 +0000
Subject: Github: update current branch

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

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 1d0d4e83..56febd15 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 1d0d4e83d8413c1b389be763cadd5d150d4be982
+Subproject commit 56febd155792b579d88281940acc97f95a10a712
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index ef62a2da..a24b701a 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,19 @@
    _ext/releasenotes.py
 
 
+2022-03-12
+==========
+
+* :vytask:`T4296` (bug): Interface config injected by Cloud-Init may interfere with VyOS native
+* :vytask:`T4002` (default): firewall group network-group long names restriction incorrect behavior
+
+
+2022-03-11
+==========
+
+* :vytask:`T4297` (bug): Interface configuration saving fails for ice/iavf based interfaces because they can't change speed/duplex settings
+
+
 2022-03-05
 ==========
 
@@ -1567,7 +1580,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.182 / 5.10.103
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.184 / 5.10.105
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 4461a5ad..9dda4e9f 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,25 @@
    _ext/releasenotes.py
 
 
+2022-03-12
+==========
+
+* :vytask:`T4296` (bug): Interface config injected by Cloud-Init may interfere with VyOS native
+* :vytask:`T4265` (feature): Add op-mode for bgp flowspec state and routes
+
+
+2022-03-11
+==========
+
+* :vytask:`T4297` (bug): Interface configuration saving fails for ice/iavf based interfaces because they can't change speed/duplex settings
+
+
+2022-03-09
+==========
+
+* :vytask:`T3981` (feature): VRF support for flow-accounting
+
+
 2022-03-05
 ==========
 
@@ -1859,7 +1878,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.182 / 5.10.103
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.184 / 5.10.105
 
 
 2021-02-15
-- 
cgit v1.2.3