From 344b99bfbc07ecc2334b243313f873183820944d Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Jun 27 2023 18:44:46 +0000 Subject: Import openvswitch3.1-3.1.0-41 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index 0ffdff9..1213713 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -325,13 +325,17 @@ index e605187b8..df9c33dfe 100644 .ci/linux-prepare.sh \ .ci/osx-build.sh \ diff --git a/NEWS b/NEWS -index 37a01dea5..e59f9530b 100644 +index 37a01dea5..8fbf7219d 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,12 @@ -+v3.1.2 - xx xxx xxxx +@@ -1,3 +1,16 @@ ++v3.1.3 - xx xxx xxxx +-------------------- + ++v3.1.2 - 27 Jun 2023 ++-------------------- ++ - Bug fixes ++ +v3.1.1 - 06 Apr 2023 +-------------------- + - Bug fixes @@ -342,7 +346,7 @@ index 37a01dea5..e59f9530b 100644 -------------------- - ovs-vswitchd now detects changes in CPU affinity and adjusts the number diff --git a/configure.ac b/configure.ac -index 9bf896c01..78a7ae31a 100644 +index 9bf896c01..48169c8fd 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -350,20 +354,26 @@ index 9bf896c01..78a7ae31a 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 3.1.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 3.1.2, bugs@openvswitch.org) ++AC_INIT(openvswitch, 3.1.3, bugs@openvswitch.org) AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/debian/changelog b/debian/changelog -index a5ad222c4..4663a2c29 100644 +index a5ad222c4..b2f60255c 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,15 @@ +@@ -1,3 +1,21 @@ ++openvswitch (3.1.3-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Tue, 27 Jun 2023 14:09:46 +0200 ++ +openvswitch (3.1.2-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Thu, 06 Apr 2023 15:10:30 +0200 ++ -- Open vSwitch team Tue, 27 Jun 2023 14:09:46 +0200 + +openvswitch (3.1.1-1) unstable; urgency=low + [ Open vSwitch team ] diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 7bcf5fd..34ee799 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 40%{?dist} +Release: 41%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -757,6 +757,13 @@ exit 0 %endif %changelog +* Tue Jun 27 2023 Open vSwitch CI - 3.1.0-41 +- Merging upstream branch-3.1 [RH git: 66f8de8365] + Commit list: + 4aba34b82b Prepare for 3.1.3. + 9167774475 Set release date for 3.1.2. + + * Fri Jun 23 2023 Open vSwitch CI - 3.1.0-40 - Merging upstream branch-3.1 [RH git: 4ccf29c3a3] Commit list: