From 41c24a072fca029c063507f0ed3eaeeb9e2b4bbf Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 9 Jan 2023 06:05:14 +0000
Subject: Github: update current branch

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

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 6af6482f..47216bbe 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 6af6482f5ab5040696635aa3f581427fb638fd1e
+Subproject commit 47216bbe29e0af8004040b5f1c9dc8450c0e8865
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 42411fc8..a995cf4d 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,24 @@
    _ext/releasenotes.py
 
 
+2023-01-07
+==========
+
+* :vytask:`T4884` (bug): Missing a community6 in snmpd config
+
+
+2023-01-05
+==========
+
+* :vytask:`T3937` (default): Rewrite "show system memory" in Python to make it usable as a library function
+
+
+2023-01-03
+==========
+
+* :vytask:`T4869` (bug): A network with `/32` or `/128` mask cannot be removed from a network-group
+
+
 2022-12-31
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 3c36cd63..36446730 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,47 @@
    _ext/releasenotes.py
 
 
+2023-01-08
+==========
+
+* :vytask:`T4920` (bug): ospf: Fix `passive-interface default` option
+
+
+2023-01-07
+==========
+
+* :vytask:`T4884` (bug): Missing a community6 in snmpd config
+
+
+2023-01-05
+==========
+
+* :vytask:`T4904` (feature): Allow multiple ports for high-availability virtual-server
+* :vytask:`T4789` (feature): Ability to get L2TP/PPTP/SSTP sessions info in a machine readable format
+* :vytask:`T3937` (default): Rewrite "show system memory" in Python to make it usable as a library function
+
+
+2023-01-04
+==========
+
+* :vytask:`T4848` (bug): Minor bug in OpenConnect server with default route
+* :vytask:`T4656` (feature): Support the listen-host config field of openconnect server
+
+
+2023-01-03
+==========
+
+* :vytask:`T4907` (bug):  nat source translations couldn't show metrics
+
+
+2023-01-02
+==========
+
+* :vytask:`T4893` (feature): l2tp add ppp-options IPv6 interface identifier
+* :vytask:`T4717` (feature): Connect to console server by name
+* :vytask:`T725` (feature): Cake and FQ-PIE
+
+
 2022-12-31
 ==========
 
-- 
cgit v1.2.3