diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index 63cea99..3b0cda9 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -16413,14 +16413,14 @@ index 037b4c3908..b341ed7559 100644 +OVS_APP_EXIT_AND_WAIT([ovsdb-server])] +AT_CLEANUP diff --git a/tests/vlog.at b/tests/vlog.at -index 3e92e70a93..595d7e9cee 100644 +index 3e92e70a93..31afb66bac 100644 --- a/tests/vlog.at +++ b/tests/vlog.at @@ -8,6 +8,7 @@ AT_CHECK([$PYTHON3 $srcdir/test-vlog.py --log-file log_file \ AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \ -e 's/File ".*", line [[0-9]][[0-9]]*,/File , line ,/' \ -+-e '/\^\+/d' \ ++-e '/\^/d' \ stderr_log], [0], [dnl 0 | module_0 | EMER | emergency 1 | module_0 | ERR | error diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 3c303c3..3c3e203 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 114%{?dist} +Release: 115%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -754,6 +754,12 @@ exit 0 %endif %changelog +* Mon Jun 03 2024 Open vSwitch CI - 3.1.0-115 +- Merging upstream branch-3.1 [RH git: a33dc9cef4] + Commit list: + 4456f2185f tests: Fix non-portable plus match in python vlog test. + + * Mon Jun 03 2024 Open vSwitch CI - 3.1.0-114 - Merging upstream branch-3.1 [RH git: d363389cb3] Commit list: