From 77dabbb5c44e82eebe8cbaa9adeeefe043349184 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 10 Apr 2023 06:05:33 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst |  8 ++++++++
 docs/changelog/1.4.rst | 44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index b65296a0..f5d40cf3 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit b65296a0ff39e66d87e916971477cce351f6d5a5
+Subproject commit f5d40cf3cf8b29a289da31bb3f0368fcfaeae3c9
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 18236014..d6ab1408 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,14 @@
    _ext/releasenotes.py
 
 
+2023-04-05
+==========
+
+* :vytask:`T4975` (bug): CLI does not work after cutting off the power or reset
+* :vytask:`T5136` (bug): Possible config corruption on upgrade
+* :vytask:`T425` (feature): AWS CloudWatch monitoring scripts
+
+
 2023-04-01
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index eab4caf1..465febef 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,50 @@
    _ext/releasenotes.py
 
 
+2023-04-10
+==========
+
+* :vytask:`T5151` (bug): EAP-TLS TLSv1.0/1.1 regression after T5003
+
+
+2023-04-07
+==========
+
+* :vytask:`T5149` (bug): op-mode openvpn should not raise error in case interface is disabled
+
+
+2023-04-06
+==========
+
+* :vytask:`T5147` (bug): Can't Commit with Container Network
+* :vytask:`T5142` (feature): One of the requirements is to use a system auditing tool to monitor and log all security-relevant events.
+* :vytask:`T5125` (feature): Add op-mode commands for hsflowd based sflow
+
+
+2023-04-05
+==========
+
+* :vytask:`T5145` (feature): Add maxsyslogins  maximum number of all logins on system 
+* :vytask:`T5135` (default): Rewrite opennhrp script using vyos.ipsec library
+* :vytask:`T4975` (bug): CLI does not work after cutting off the power or reset
+* :vytask:`T5136` (bug): Possible config corruption on upgrade
+
+
+2023-04-04
+==========
+
+* :vytask:`T5141` (feature): Add numbers for dhclient-exit-hooks.d to enforce script order execution
+* :vytask:`T5093` (bug): Command 'reset vpn ipsec-profile' doesn't work
+* :vytask:`T4362` (bug): Wan Load Balancing - Can't create routing tables
+
+
+2023-04-03
+==========
+
+* :vytask:`T5139` (feature): IKE life-time should start from 0 for disable rekey 
+* :vytask:`T4173` (bug): Wan Load Balancing - Error on firewall NAT rules
+
+
 2023-04-02
 ==========
 
-- 
cgit v1.2.3