Github: update current branch

4 files changed, 100 insertions, 8 deletions

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject f6a87a32d61c0f9928824b2426da3c8510a4f11
+Subproject 7720ee247c03eeeab895da27804996571ffb476
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 5765f78b..dc9c3414 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,24 @@
    _ext/releasenotes.py
 
 
+2023-10-08
+==========
+
+* :vytask:`T5630` ``(feature): pppoe: allow to specify MRU in addition to already configurable MTU``
+
+
+2023-10-06
+==========
+
+* :vytask:`T5576` ``(feature): Add bgp remove-private-as all option``
+
+
+2023-10-04
+==========
+
+* :vytask:`T5632` ``(feature): Add jq package to parse JSON files``
+
+
 2023-09-25
 ==========
 
@@ -236,6 +254,12 @@
 * :vytask:`T5280` ``(bug): Update Expired keys (2023-06-08) for PowerDNS``
 
 
+2023-06-13
+==========
+
+* :vytask:`T5213` ``(feature): Accel-ppp sending accounting interim updates acct-interim-interval option``
+
+
 2023-05-29
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 268bb53d..86fec4d4 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,46 @@
    _ext/releasenotes.py
 
 
+2023-10-08
+==========
+
+* :vytask:`T5630` ``(feature): pppoe: allow to specify MRU in addition to already configurable MTU``
+
+
+2023-10-06
+==========
+
+* :vytask:`T5096` ``(feature): Change 'accept' firewall rule action from 'return' to 'accept'``
+* :vytask:`T5576` ``(feature): Add bgp remove-private-as all option``
+* :vytask:`T3506` ``(default): Migrate loadkey command to op-mode``
+
+
+2023-10-05
+==========
+
+* :vytask:`T4320` ``(default): Remove legacy version files in vyatta-cfg-system/cfg-version``
+
+
+2023-10-04
+==========
+
+* :vytask:`T5632` ``(feature): Add jq package to parse JSON files``
+* :vytask:`T3655` ``(bug): NAT  Problem with VRF``
+* :vytask:`T5585` ``(bug): Fix file access mode for dynamic dns configuration``
+
+
+2023-10-03
+==========
+
+* :vytask:`T5618` ``(bug): Flow-accounting crushes when IMT is enabled``
+* :vytask:`T5561` ``(feature): NAT - Inbound or outbound interface should not be mandatory``
+* :vytask:`T5553` ``(feature): Firewall - Add action continue``
+* :vytask:`T5250` ``(bug): Firewall - show firewall group``
+* :vytask:`T4383` ``(bug): Flow Accounting returns permission error and fails to start``
+* :vytask:`T5626` ``(feature): Only select required Kernel CGROUP controllers``
+* :vytask:`T5628` ``(feature): op-mode: login: DeprecationWarning: 'spwd'``
+
+
 2023-10-01
 ==========
 
@@ -129,7 +169,6 @@
 2023-09-07
 ==========
 
-* :vytask:`T5489` ``(feature): Change to BBR as TCP congestion control, or at least make it an config option``
 * :vytask:`T5510` ``(feature): Shrink imagesize and improve read performance by changing mksquashfs syntax``
 
 
@@ -2653,12 +2692,6 @@
 * :vytask:`T4272` ``(feature): lldp: migrate Python script to use get_config_dict()``
 
 
-2022-02-25
-==========
-
-* :vytask:`T4269` ``(feature): node.def generator should automatically add default values``
-
-
 2022-02-24
 ==========
 
diff --git a/docs/changelog/1.5.rst b/docs/changelog/1.5.rst
index 323f3756..a91af953 100644
--- a/docs/changelog/1.5.rst
+++ b/docs/changelog/1.5.rst
@@ -8,6 +8,42 @@
    _ext/releasenotes.py
 
 
+2023-10-08
+==========
+
+* :vytask:`T5630` ``(feature): pppoe: allow to specify MRU in addition to already configurable MTU``
+
+
+2023-10-06
+==========
+
+* :vytask:`T5576` ``(feature): Add bgp remove-private-as all option``
+
+
+2023-10-05
+==========
+
+* :vytask:`T4320` ``(default): Remove legacy version files in vyatta-cfg-system/cfg-version``
+
+
+2023-10-04
+==========
+
+* :vytask:`T5632` ``(feature): Add jq package to parse JSON files``
+* :vytask:`T3655` ``(bug): NAT  Problem with VRF``
+* :vytask:`T5585` ``(bug): Fix file access mode for dynamic dns configuration``
+
+
+2023-10-03
+==========
+
+* :vytask:`T5618` ``(bug): Flow-accounting crushes when IMT is enabled``
+* :vytask:`T5579` ``(bug): Log firewall - Wrong command after firewall refactor``
+* :vytask:`T5561` ``(feature): NAT - Inbound or outbound interface should not be mandatory``
+* :vytask:`T5626` ``(feature): Only select required Kernel CGROUP controllers``
+* :vytask:`T5628` ``(feature): op-mode: login: DeprecationWarning: 'spwd'``
+
+
 2023-09-28
 ==========
 
@@ -89,7 +125,6 @@
 ==========
 
 * :vytask:`T5556` ``(bug): reboot now and  poweroff does not work``
-* :vytask:`T5489` ``(feature): Change to BBR as TCP congestion control, or at least make it an config option``
 
 
 2023-09-06