Github: update current branch

3 files changed, 77 insertions, 4 deletions

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 1353757247c027f6352000a9450b502c25c460c
+Subproject 22e3558834784a8ca37f6335c15c58a631a7fe1
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index c6a04bbf..b7dd1861 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,41 @@
    _ext/releasenotes.py
 
 
+2021-11-20
+==========
+
+* :vytask:`T4004` (bug): IPsec ike-group parameters are not saved correctly (after reboot)
+
+
+2021-11-19
+==========
+
+* :vytask:`T4003` (bug): API for "show interfaces ethernet" does not include the interface description
+* :vytask:`T4011` (bug): ethernet: deleting interface should place interface in admin down state
+
+
+2021-11-18
+==========
+
+* :vytask:`T3995` (feature): OpenVPN: do not stop/start service on configuration change
+* :vytask:`T4008` (feature): dhcp: change client retry interval form 300 -> 60 seconds
+* :vytask:`T3795` (bug): WWAN: issues with non connected interface / no signal
+
+
+2021-11-17
+==========
+
+* :vytask:`T3350` (bug): OpenVPN config file generation broken
+* :vytask:`T3996` (bug): SNMP service error in log
+
+
+2021-11-15
+==========
+
+* :vytask:`T3934` (bug): Openconnect VPN broken: ocserv-worker general protection fault on client connect
+* :vytask:`T3724` (feature): Allow setting host-name in l2tp section of accel-ppp
+
+
 2021-11-14
 ==========
 
@@ -466,7 +501,6 @@
 ==========
 
 * :vytask:`T3745` (feature): op-mode IPSec show vpn ipse sa sorting
-* :vytask:`T1083` (feature): Implement "--persistent" option to NAT rules
 * :vytask:`T521` (bug): Network services may fail if vyatta-router.service startup takes longer than a few seconds
 
 
@@ -1107,7 +1141,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.155 / 5.10.75
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.160 / 5.10.80
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 18fcb1fc..4f1a9df2 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,46 @@
    _ext/releasenotes.py
 
 
+2021-11-20
+==========
+
+* :vytask:`T3998` (bug): route-target completion incorrect description
+
+
+2021-11-19
+==========
+
+* :vytask:`T4003` (bug): API for "show interfaces ethernet" does not include the interface description
+* :vytask:`T4011` (bug): ethernet: deleting interface should place interface in admin down state
+
+
+2021-11-18
+==========
+
+* :vytask:`T3612` (bug): IPoE Server address pool issues. 
+* :vytask:`T3995` (feature): OpenVPN: do not stop/start service on configuration change
+* :vytask:`T3680` (bug): Static routes with dhcp-interface are flaky
+* :vytask:`T4008` (feature): dhcp: change client retry interval form 300 -> 60 seconds
+* :vytask:`T3795` (bug): WWAN: issues with non connected interface / no signal
+* :vytask:`T3510` (bug): RADIUS usersname is not shown on CLI
+
+
+2021-11-17
+==========
+
+* :vytask:`T3350` (bug): OpenVPN config file generation broken
+* :vytask:`T3996` (bug): SNMP service error in log
+
+
+2021-11-15
+==========
+
+* :vytask:`T3994` (bug): VRF: unable to delete vrf when name contains numbers, hyphen or underscore
+* :vytask:`T3960` (bug): FRR Misconfig when using multiple VRF VNI
+* :vytask:`T3724` (feature): Allow setting host-name in l2tp section of accel-ppp
+* :vytask:`T645` (feature): Allow multiple prefixes in ipsec tunnel
+
+
 2021-11-10
 ==========
 
@@ -483,7 +523,6 @@
 ==========
 
 * :vytask:`T3745` (feature): op-mode IPSec show vpn ipse sa sorting
-* :vytask:`T1083` (feature): Implement "--persistent" option to NAT rules
 
 
 2021-08-13
@@ -1251,7 +1290,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.155 / 5.10.75
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.160 / 5.10.80
 
 
 2021-02-15