From 2322cc26261835e5dcf08db9c892bfaf84b1b1b9 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 17 Oct 2022 06:29:35 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 18 ++++++++++++++++++
 docs/changelog/1.4.rst | 47 +++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 72c97ec2..288d917b 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 72c97ec2cb868b6208621566678dd42791e8e5c7
+Subproject commit 288d917b7c87b9a328220c8e978f2952fc7dbc32
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 9a3e1cf2..76f6a616 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,24 @@
    _ext/releasenotes.py
 
 
+2022-10-13
+==========
+
+* :vytask:`T4312` (bug): Telegraf configuration doesn't accept IPs for URL
+
+
+2022-10-12
+==========
+
+* :vytask:`T4730` (bug): Conntrack-sync error - listen-address is not the correct type in config as it should be
+
+
+2022-10-11
+==========
+
+* :vytask:`T4680` (bug): Telegraf prometheus-client listen-address invalid format
+
+
 2022-10-04
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 2624abcf..af8be17b 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,47 @@
    _ext/releasenotes.py
 
 
+2022-10-14
+==========
+
+* :vytask:`T4750` (feature): Support of higher level SSH keys (sk-ssh-ed25519)
+* :vytask:`T4672` (bug): RADIUS server disable does not work
+* :vytask:`T4749` (enhancment): Use config_dict for conf_mode http-api.py
+
+
+2022-10-13
+==========
+
+* :vytask:`T4746` (bug): Monitoring nft. table vyos_filter by default does not exist but telegraf checks this table
+* :vytask:`T4744` (bug): BGP directly connected neighbors don't compatible with ebgp-multihop
+* :vytask:`T4716` (feature): SSH ability to configure RekeyLimit
+* :vytask:`T4343` (default): Expose powerdns network-timeout for service dns forwarding
+* :vytask:`T4312` (bug): Telegraf configuration doesn't accept IPs for URL
+* :vytask:`T4274` (default): Extend OpenConnect RADIUS Timeout to Permit 2FA Entry
+
+
+2022-10-12
+==========
+
+* :vytask:`T4747` (bug): Monitoring influxdb template input exec plugin does not work
+* :vytask:`T4740` (bug): Show conntrack table ipv6 fail
+* :vytask:`T4730` (bug): Conntrack-sync error - listen-address is not the correct type in config as it should be
+
+
+2022-10-11
+==========
+
+* :vytask:`T4742` (bug): Autocomplete in policy route rule x set table / does not show the tables created in the static protocols
+* :vytask:`T4741` (bug): set firewall zone Local local-zone failed
+* :vytask:`T4680` (bug): Telegraf prometheus-client listen-address invalid format
+
+
+2022-10-10
+==========
+
+* :vytask:`T538` (feature): Support for network mapping in NAT
+
+
 2022-10-09
 ==========
 
@@ -106,12 +147,6 @@
 * :vytask:`T4681` (feature): Complete standardization of show_uptime.py
 
 
-2022-09-08
-==========
-
-* :vytask:`T4526` (bug): keepalived-fifo.py unable to load config
-
-
 2022-09-06
 ==========
 
-- 
cgit v1.2.3