From 2276c7df3db82e2786aa1b83710aed74cdcc8e66 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 3 Oct 2022 06:11:17 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.4.rst | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 8f2f6303..8248aaaa 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 8f2f6303229814c03494369c51cedd31703406ec
+Subproject commit 8248aaaa7952db580a199bd36202e7f26c19ec88
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index f981da3c..edb6c729 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,20 @@
    _ext/releasenotes.py
 
 
+2022-09-29
+==========
+
+* :vytask:`T4715` (feature): Auto logout user after a period of inactivity
+* :vytask:`T4697` (bug): policy route: Generating ConfigError failes when tcp flag is missing on set tcp-mss rule commit
+
+
+2022-09-27
+==========
+
+* :vytask:`T4711` (feature): Ability to terminate user TTY and PTS sessions
+* :vytask:`T4557` (feature): fastnetmon: allow configure limits per protocol (tcp, udp, icmp)
+
+
 2022-09-21
 ==========
 
-- 
cgit v1.2.3