From e9001e65b7483afcf272fbb295b6ae40778e3972 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 24 Jul 2023 06:05:45 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst |  6 ++++++
 docs/changelog/1.4.rst | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 751d326c..20b7155f 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 751d326c7769ac18db69de8f2be39587148be209
+Subproject commit 20b7155f4140f54cf7669256160b6fedd8c1ab7a
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index f64ff9ec..ecb291e7 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,12 @@
    _ext/releasenotes.py
 
 
+2023-07-17
+==========
+
+* :vytask:`T2051` ``(bug): Throughput anomalies``
+
+
 2023-07-14
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index a6737cc9..e60970c0 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,39 @@
    _ext/releasenotes.py
 
 
+2023-07-21
+==========
+
+* :vytask:`T5373` ``(bug): LLDP seems to be running even if its disabled on all interfaces``
+* :vytask:`T5328` ``(default): bgp: Incorrect warning showed for address-family configured with neighbor as interface``
+* :vytask:`T5363` ``(bug): Bash history file does not exists after reboot and ony other file in home directory``
+* :vytask:`T5385` ``(bug): reference_tree: catch parse error on non-transcluded files``
+* :vytask:`T5361` ``(bug): "monitor log" behaves like "show log"``
+
+
+2023-07-20
+==========
+
+* :vytask:`T5362` ``(bug): `set high-availability vrrp global-parameters version 3` seems to have no effect``
+* :vytask:`T5355` ``(bug): IPSec: OP cmd : "show vpn ike sa" does not show output``
+* :vytask:`T5330` ``(enhancment): Keep track of source of config dict value when merging defaults``
+* :vytask:`T4497` ``(feature): ping cannot force ipv4 or ipv6``
+* :vytask:`T4288` ``(bug): IPsec tunnel will break when ESP timeout``
+
+
+2023-07-19
+==========
+
+* :vytask:`T5340` ``(bug): SNMP and VRF``
+* :vytask:`T5059` ``(feature): add 'disable' option to DHCP relay config``
+
+
+2023-07-17
+==========
+
+* :vytask:`T2051` ``(bug): Throughput anomalies``
+
+
 2023-07-16
 ==========
 
-- 
cgit v1.2.3