From d7811074dafba93cb8b97755b9e87797312f11b3 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 8 Aug 2022 06:05:20 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst |  8 +++++++-
 docs/changelog/1.4.rst | 22 +++++++++++++++++++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 225b1d3e..1b637f78 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 225b1d3ef2e211c03814cb823b857c66084f7978
+Subproject commit 1b637f78b870f8ecc4971de5baf0a6fda54c40f7
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 5869ec60..071a49f1 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,12 @@
    _ext/releasenotes.py
 
 
+2022-08-02
+==========
+
+* :vytask:`T4515` (default): Reduce telegraf binary size
+
+
 2022-07-30
 ==========
 
@@ -1822,7 +1828,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.204 / 5.10.129
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.208 / 5.10.135
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 46d32beb..cdad92e2 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,26 @@
    _ext/releasenotes.py
 
 
+2022-08-04
+==========
+
+* :vytask:`T4257` (feature): Discussion on changing BGP autonomous system number syntax
+
+
+2022-08-02
+==========
+
+* :vytask:`T4585` (feature): Rewrite op-mode containers to vyos.opmode 
+* :vytask:`T4515` (default): Reduce telegraf binary size
+
+
+2022-08-01
+==========
+
+* :vytask:`T4581` (bug): 'show system cpu' not working
+* :vytask:`T4578` (feature): Rewrite show dns forwarding statistics to new format
+
+
 2022-07-31
 ==========
 
@@ -2478,7 +2498,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.204 / 5.10.129
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.208 / 5.10.135
 
 
 2021-02-15
-- 
cgit v1.2.3