From c9d13cdc138ee5a2f90dee94e0f947c3299aed78 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 24 Oct 2022 06:32:39 +0000
Subject: Github: update current branch

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

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 288d917b..f157aea8 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 288d917b7c87b9a328220c8e978f2952fc7dbc32
+Subproject commit f157aea8c7dddd159c9daecc528250370d560db2
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 76f6a616..63111c53 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,18 @@
    _ext/releasenotes.py
 
 
+2022-10-21
+==========
+
+* :vytask:`T2189` (bug): Adding a large port-range will take ~ 20 minutes to commit
+
+
+2022-10-18
+==========
+
+* :vytask:`T4533` (bug): Radius clients don’t  have simple permissions
+
+
 2022-10-13
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index af8be17b..6af3ccae 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,32 @@
    _ext/releasenotes.py
 
 
+2022-10-23
+==========
+
+* :vytask:`T3723` (bug): op-mode IPSec show vpn ipsec sa output with underscores
+
+
+2022-10-21
+==========
+
+* :vytask:`T4768` (default): Change name of api child node from 'gql' to 'graphql'
+
+
+2022-10-18
+==========
+
+* :vytask:`T4684` (feature): Rewrite show ip route by protocol to vyos.opmode format
+* :vytask:`T4533` (bug): Radius clients don’t  have simple permissions
+* :vytask:`T4753` (enhancment): Extend automatic generation of schema to query SystemStatus
+
+
+2022-10-17
+==========
+
+* :vytask:`T4725` (bug): Unable to reset vpn IPsec peer
+
+
 2022-10-14
 ==========
 
@@ -2812,7 +2838,6 @@
 ==========
 
 * :vytask:`T2848` (feature): bgp-add-path configuration options
-* :vytask:`T1875` (feature): Add the ability to use network address as BGP neighbor (bgp listen range)
 
 
 2021-02-12
-- 
cgit v1.2.3