From b58ff6bcc0ac028be5eaebf9d1381430ddc3c736 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 6 Dec 2021 06:20:52 +0000
Subject: Github: update current branch

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

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index b675c8b6..025f0609 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit b675c8b6187c4b77759e3f96c9c92dd382dabeae
+Subproject commit 025f0609cea8591e93b8cb4a7d0256e43e23323b
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 68d15822..058f38d6 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,49 @@
    _ext/releasenotes.py
 
 
+2021-12-05
+==========
+
+* :vytask:`T4034` (bug): "make xcp-ng-iso" still includes vyos-xe-guest-utilities
+* :vytask:`T2076` (feature): RAID install: sfdisk change-id is deprecated in favor of --part-type
+* :vytask:`T4041` (bug): "transition-script" doesn't work on "sync-group"
+* :vytask:`T1869` (bug): Install  and Boot from RAID Doesn't Work
+* :vytask:`T1126` (bug): Reusing a RAID from a BIOS install in an EFI install causes a failure to boot
+
+
+2021-12-04
+==========
+
+* :vytask:`T4049` (feature): support command-style output with compare command
+* :vytask:`T4047` (bug): Wrong regex validation in XML definitions
+* :vytask:`T4045` (bug): Unable to "format disk <new> like <old>"
+
+
+2021-12-02
+==========
+
+* :vytask:`T4035` (bug): Geneve interfaces aren't displayed by operational mode commands
+
+
+2021-12-01
+==========
+
+* :vytask:`T3695` (bug): OpenConnect reports commit success when ocserv fails to start due to SSL cert/key file issues
+
+
+2021-11-30
+==========
+
+* :vytask:`T3725` (feature): show configuration in json format
+
+
+2021-11-29
+==========
+
+* :vytask:`T2661` (bug): SSTP wrong certificates check
+* :vytask:`T3946` (enhancment): Automatically resize the root partition if the drive has extra space
+
+
 2021-11-28
 ==========
 
@@ -1172,7 +1215,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.162 / 5.10.82
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.163 / 5.10.83
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 047f2a6b..a0ad3143 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,50 @@
    _ext/releasenotes.py
 
 
+2021-12-05
+==========
+
+* :vytask:`T4041` (bug): "transition-script" doesn't work on "sync-group"
+
+
+2021-12-04
+==========
+
+* :vytask:`T4049` (feature): support command-style output with compare command
+* :vytask:`T4047` (bug): Wrong regex validation in XML definitions
+* :vytask:`T4042` (bug): BGP L2VPN / EVPN and RD type 0 set
+* :vytask:`T4048` (bug): BGP: L2VPN/EVPN and individual RD and RT settings for each VNI
+* :vytask:`T4045` (bug): Unable to "format disk <new> like <old>"
+* :vytask:`T4044` (feature): BFD: add vrf support
+* :vytask:`T4043` (feature): BFD: add support for passive mode
+
+
+2021-12-02
+==========
+
+* :vytask:`T4035` (bug): Geneve interfaces aren't displayed by operational mode commands
+* :vytask:`T3950` (bug): CLI backtrace on update if DNS not defined 
+
+
+2021-12-01
+==========
+
+* :vytask:`T3695` (bug): OpenConnect reports commit success when ocserv fails to start due to SSL cert/key file issues
+
+
+2021-11-30
+==========
+
+* :vytask:`T4010` (bug): DMVPN generates incorrect configuration life_time for swanctl.conf
+* :vytask:`T3725` (feature): show configuration in json format
+
+
+2021-11-29
+==========
+
+* :vytask:`T3946` (enhancment): Automatically resize the root partition if the drive has extra space
+
+
 2021-11-28
 ==========
 
@@ -711,7 +755,6 @@
 
 * :vytask:`T3647` (feature): Bullseye: gcc defaults to passing --as-needed to linker
 * :vytask:`T3644` (default): Replace GCC with a simpler preprocessor for including nested XML snippets in XML documents
-* :vytask:`T3356` (feature): Script for remote file transfers
 
 
 2021-06-22
@@ -1331,7 +1374,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.162 / 5.10.82
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.163 / 5.10.83
 
 
 2021-02-15
-- 
cgit v1.2.3