From b69e04081b7a37037318cac131ccbcfce259f3e0 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 22 2021 07:38:45 +0000 Subject: Import openvswitch2.13-2.13.0-134 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index b02b19f..8e46a0c 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -988,12 +988,16 @@ index b279303d18..b3b56cd50e 100644 boot.sh \ poc/builders/Vagrantfile \ diff --git a/NEWS b/NEWS -index dab94e924d..0ae1076ee1 100644 +index dab94e924d..8409097356 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,56 @@ -+v2.13.5 - xx xxx xxxx +@@ -1,3 +1,60 @@ ++v2.13.6 - xx xxx xxxx +--------------------- ++ ++v2.13.5 - 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. @@ -1048,7 +1052,7 @@ index dab94e924d..0ae1076ee1 100644 v2.13.0 - 14 Feb 2020 --------------------- - OVN: -@@ -43,6 +96,9 @@ v2.13.0 - 14 Feb 2020 +@@ -43,6 +100,9 @@ v2.13.0 - 14 Feb 2020 - 'ovs-appctl dpctl/dump-flows' can now show offloaded=partial for partially offloaded flows, dp:dpdk for fully offloaded by dpdk, and type filter supports new filters: "dpdk" and "partially-offloaded". @@ -1058,7 +1062,7 @@ index dab94e924d..0ae1076ee1 100644 v2.12.0 - 03 Sep 2019 --------------------- -@@ -117,9 +173,6 @@ v2.12.0 - 03 Sep 2019 +@@ -117,9 +177,6 @@ v2.12.0 - 03 Sep 2019 * Add support for conntrack zone-based timeout policy. - 'ovs-dpctl dump-flows' is no longer suitable for dumping offloaded flows. 'ovs-appctl dpctl/dump-flows' should be used instead. @@ -1209,7 +1213,7 @@ index f6b88ca2d0..9429702db9 100755 manpages=`cd $distdir && echo *` diff --git a/configure.ac b/configure.ac -index 92b52f6712..0dc2a7dbca 100644 +index 92b52f6712..7fe5e83e84 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -1217,7 +1221,7 @@ index 92b52f6712..0dc2a7dbca 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 2.13.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 2.13.5, bugs@openvswitch.org) ++AC_INIT(openvswitch, 2.13.6, bugs@openvswitch.org) AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -1931,15 +1935,21 @@ index 23118e8b63..05ccfb9288 100644 *saddr = fl6.saddr; if (use_cache) diff --git a/debian/changelog b/debian/changelog -index 8e075bc98b..05025442a6 100644 +index 8e075bc98b..16c04acacd 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,33 @@ +@@ -1,3 +1,39 @@ ++openvswitch (2.13.6-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Thu, 21 Oct 2021 23:58:08 +0200 ++ +openvswitch (2.13.5-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Thu, 01 Jul 2021 20:17:41 +0200 ++ -- Open vSwitch team Thu, 21 Oct 2021 23:58:08 +0200 + +openvswitch (2.13.4-1) unstable; urgency=low + [ Open vSwitch team ] diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 8cf050c..d9c5f51 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 133%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 134%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -712,6 +712,13 @@ exit 0 %endif %changelog +* Fri Oct 22 2021 Open vSwitch CI - 2.13.0-134 +- Merging upstream branch-2.13 [RH git: c72ff28f03] + Commit list: + 4d5470a450 Prepare for 2.13.6. + 6771b9c9d7 Set release date for 2.13.5. + + * Thu Oct 21 2021 Open vSwitch CI - 2.13.0-133 - Merging upstream branch-2.13 [RH git: d37b008459] Commit list: