From 014f4f57ae8da1a7b8233b0c8df401c166b92c92 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 12 Jul 2021 06:21:20 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 18 ++++++++++++++++++
 docs/changelog/1.4.rst | 25 ++++++++++++++++++++++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index 562ead14..2f3043ff 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit 562ead14a6dd1eb9190b9a9f38981423937bfc94
+Subproject commit 2f3043ffce8a2556d12b3193df7fd3cdc9fdad09
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 17984e03..240bf5ea 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,18 @@
    _ext/releasenotes.py
 
 
+2021-07-11
+==========
+
+* :vytask:`T3665` (bug): Missing VRF support for VxLAN but already documented
+
+
+2021-07-06
+==========
+
+* :vytask:`T3660` (feature): Conntrack-Sync configuration command to specify destination udp port for peer
+
+
 2021-07-01
 ==========
 
@@ -46,6 +58,12 @@
 * :vytask:`T3582` (default): 'delete log file' does not work
 
 
+2021-06-20
+==========
+
+* :vytask:`T3637` (bug): vrf: bind-to-all didn't work properly
+
+
 2021-06-19
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index ce43c7c9..95fa7c4b 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,30 @@
    _ext/releasenotes.py
 
 
+2021-07-11
+==========
+
+* :vytask:`T3665` (bug): Missing VRF support for VxLAN but already documented
+
+
+2021-07-10
+==========
+
+* :vytask:`T3636` (feature): SSTP / L2TP ipv6 support broken
+
+
+2021-07-09
+==========
+
+* :vytask:`T3667` (bug): brctl is damaged
+
+
+2021-07-06
+==========
+
+* :vytask:`T3660` (feature): Conntrack-Sync configuration command to specify destination udp port for peer
+
+
 2021-07-03
 ==========
 
@@ -61,7 +85,6 @@
 2021-06-21
 ==========
 
-* :vytask:`T3628` (bug): commit-archive source-address Interface Broken
 * :vytask:`T3563` (default): commit-archive breaks with IPv6 source addresses
 
 
-- 
cgit v1.2.3