From 86e721a9550d187e36ff5404a15b3124a8c67cd6 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 25 2021 14:43:00 +0000 Subject: Import openvswitch2.15-2.15.0-48 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 238d7f5..8d578fc 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -178,12 +178,16 @@ index 103495415a..a98ec672fc 100644 This configuration accomplishes that the high priority traffic has a guaranteed bandwidth egressing the ports at CIR (1000pps), but it can also diff --git a/NEWS b/NEWS -index bc901efdb1..154a299d93 100644 +index bc901efdb1..d0f0cc8d85 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,21 @@ -+v2.15.2 - xx xxx xxxx +@@ -1,3 +1,25 @@ ++v2.15.3 - xx xxx xxxx ++--------------------- ++ ++v2.15.2 - 21 Oct 2021 +--------------------- ++ - Bug fixes + - OVS now reports the datapath capability 'ct_zero_snat', which reflects + whether the SNAT with all-zero IP address is supported. + See ovs-vswitchd.conf.db(5) for details. @@ -222,7 +226,7 @@ index 435685c93d..15a54d636f 100644 AC_CHECK_MEMBERS([struct tcf_t.firstuse], [], [], [#include ]) diff --git a/configure.ac b/configure.ac -index fd82d7d270..bcee218005 100644 +index fd82d7d270..4a14ffb748 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -230,7 +234,7 @@ index fd82d7d270..bcee218005 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 2.15.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 2.15.2, bugs@openvswitch.org) ++AC_INIT(openvswitch, 2.15.3, bugs@openvswitch.org) AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -475,15 +479,21 @@ index d50a126b43..18f884f41b 100644 diff --git a/debian/changelog b/debian/changelog -index 1f2b7a3668..ed5b127e59 100644 +index 1f2b7a3668..bce2f5c305 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,15 @@ +@@ -1,3 +1,21 @@ ++openvswitch (2.15.3-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Thu, 21 Oct 2021 23:58:11 +0200 ++ +openvswitch (2.15.2-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Thu, 01 Jul 2021 20:19:24 +0200 ++ -- Open vSwitch team Thu, 21 Oct 2021 23:58:11 +0200 + +openvswitch (2.15.1-1) unstable; urgency=low + [ Open vSwitch team ] diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 2973eb9..ec02b54 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 47%{?dist} +Release: 48%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,13 @@ exit 0 %endif %changelog +* Mon Oct 25 2021 Open vSwitch CI - 2.15.0-48 +- Merging upstream branch-2.15 [RH git: 7cf784736e] + Commit list: + 2cf63851a5 Prepare for 2.15.3. + 63f9a7c5d8 Set release date for 2.15.2. + + * Tue Oct 19 2021 Open vSwitch CI - 2.15.0-47 - Merging upstream branch-2.15 [RH git: 01110b9088] Commit list: