From 2e313439401a3dac8c877bd987cc36797ff516ee Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 9 May 2022 06:07:12 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 13 +++++++++++++
 docs/changelog/1.4.rst | 27 ++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 318f81cb..432fd1b5 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 318f81cba207dc5f180b074c2a7cdb4a4217e5fc
+Subproject commit 432fd1b5e7b5a1e5b8503bf0dcd106369e323dc7
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 5eca3b31..ccbd77d1 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,19 @@
    _ext/releasenotes.py
 
 
+2022-05-07
+==========
+
+* :vytask:`T4361` (bug): `vyos.config.exists()` does not work for nodes with multiple values
+* :vytask:`T4354` (bug): Slave interfaces fall out from bonding during configuration change
+
+
+2022-05-03
+==========
+
+* :vytask:`T4395` (feature): Extend show vpn debug 
+
+
 2022-05-01
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 5238efe7..1a8d5691 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,32 @@
    _ext/releasenotes.py
 
 
+2022-05-07
+==========
+
+* :vytask:`T4361` (bug): `vyos.config.exists()` does not work for nodes with multiple values
+* :vytask:`T4354` (bug): Slave interfaces fall out from bonding during configuration change
+* :vytask:`T4419` (feature): vrf: support to disable IP forwarding within a given VRF
+
+
+2022-05-06
+==========
+
+* :vytask:`T4385` (bug): bgp: peer-group member cannot override remote-as of peer-group
+
+
+2022-05-05
+==========
+
+* :vytask:`T4414` (feature): Add route-map "as-path prepend last-as x" option
+
+
+2022-05-03
+==========
+
+* :vytask:`T4395` (feature): Extend show vpn debug 
+
+
 2022-05-01
 ==========
 
@@ -72,7 +98,6 @@
 2022-04-21
 ==========
 
-* :vytask:`T4385` (bug): bgp: peer-group member cannot override remote-as of peer-group
 * :vytask:`T4384` (feature): pppoe: replace default-route CLI option with common CLI nodes already present for DHCP
 
 
-- 
cgit v1.2.3