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

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

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 20b7155f..1a44d860 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 20b7155f4140f54cf7669256160b6fedd8c1ab7a
+Subproject commit 1a44d8607f715934f2c03f28a9bf547321b26ed8
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index ecb291e7..775257d4 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,12 @@
    _ext/releasenotes.py
 
 
+2023-07-24
+==========
+
+* :vytask:`T5354` ``(feature): Add sshguard to protect against brut-forces for 1.3``
+
+
 2023-07-17
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index e60970c0..9b8ca26a 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,41 @@
    _ext/releasenotes.py
 
 
+2023-07-29
+==========
+
+* :vytask:`T5403` ``(feature): Add support for extending xml cache``
+
+
+2023-07-28
+==========
+
+* :vytask:`T4602` ``(bug): DHCP `ping-check` enabled by default``
+* :vytask:`T5411` ``(feature): Remove old background monitoring implementation``
+* :vytask:`T5317` ``(enhancment): configtree: remove mutable references``
+* :vytask:`T5316` ``(enhancment): configtree: use a single pass of the diff algorithm``
+
+
+2023-07-27
+==========
+
+* :vytask:`T5368` ``(feature): FastNetmon service ids ddos-protection add support sflow mode``
+
+
+2023-07-26
+==========
+
+* :vytask:`T5398` ``(bug): FRR mangles container network interface names``
+* :vytask:`T5365` ``(bug): Container systemd units require authentication``
+* :vytask:`T4974` ``(feature): OpenVPN- Data Channel Offload(DCO)``
+
+
+2023-07-25
+==========
+
+* :vytask:`T5377` ``(feature): ospf: add graceful restart FRR feature (RFC 3623)``
+
+
 2023-07-21
 ==========
 
@@ -89,7 +124,6 @@
 * :vytask:`T4815` ``(bug): Fix various name server config issues``
 * :vytask:`T4810` ``(bug): Op-mode show/monitor log pppoe interface does not show any logs``
 * :vytask:`T4758` ``(feature): Rewrite show dhcp server to vyos.opmode format``
-* :vytask:`T4460` ``(bug): nhrp not starting due to missing cisco-authentication value``
 * :vytask:`T4262` ``(bug): install image doesn't respect chosen root partition size``
 * :vytask:`T3810` ``(bug): webproxy squidguard rules don't work properly after rewriting to python.``
 * :vytask:`T1928` ``(bug): Is the 'Welcome to VyOS' message when using SSH an information leak?``
-- 
cgit v1.2.3