summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/pr-conflicts.yml2
m---------docs/_include/vyos-1x0
-rw-r--r--docs/changelog/1.3.rst6
-rw-r--r--docs/changelog/1.4.rst13
4 files changed, 20 insertions, 1 deletions
diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml
index 87bc8c9f..8f2db469 100644
--- a/.github/workflows/pr-conflicts.yml
+++ b/.github/workflows/pr-conflicts.yml
@@ -6,7 +6,7 @@ on:
jobs:
Conflict_Check:
name: 'Check PR status: conflicts and resolution'
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-22.04
steps:
- name: check if PRs are dirty
uses: eps1lon/actions-label-merge-conflict@releases/2.x
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 684c4e043f61bb186a954ffa2b49e3ebb6838a6
+Subproject 12b7da289665c75c3839b32c77a491d8909f3e7
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 0dc1f411..3c0c0848 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,12 @@
_ext/releasenotes.py
+2023-05-29
+==========
+
+* :vytask:`T5243` ``(bug): Default route is inactive if an interface has multiple ip addresses of the same subnet in 1.3.2 Equuleus``
+
+
2023-05-19
==========
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 9e85456c..d7c75ee6 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,19 @@
_ext/releasenotes.py
+2023-06-02
+==========
+
+* :vytask:`T5252` ``(bug): Route distinguisher and route targets changing upon adding interface to new VRF``
+* :vytask:`T5251` ``(bug): Uncaught errors for functions delete/delete_value in Python module configtree.py``
+
+
+2023-06-01
+==========
+
+* :vytask:`T5127` ``(bug): VPNv4/VPNv6 routes are not reinstalled following link flap``
+
+
2023-05-28
==========