From 2e62764dd661028ac238bec6fc58025b3f8ebbf5 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: May 07 2024 23:51:13 +0000 Subject: Import openvswitch2.17-2.17.0-150 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index 4920bc6..a6ca91d 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -110871,6 +110871,22 @@ index 0f222cc992..952fa902e4 100644 ovsdb_jsonrpc_monitor_destroy(jm->jsonrpc_monitor, true); } } +diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c +index f1b8d64910..095283709a 100644 +--- a/ovsdb/ovsdb-client.c ++++ b/ovsdb/ovsdb-client.c +@@ -451,8 +451,9 @@ usage(void) + " wait until DATABASE reaches STATE " + "(\"added\" or \"connected\" or \"removed\")\n" + " in DATBASE on SERVER.\n" +- "\n dump [SERVER] [DATABASE]\n" +- " dump contents of DATABASE on SERVER to stdout\n" ++ "\n dump [SERVER] [DATABASE] [TABLE]\n" ++ " dump contents of TABLE (or all tables) in DATABASE on SERVER\n" ++ " to stdout\n" + "\n backup [SERVER] [DATABASE] > SNAPSHOT\n" + " dump database contents in the form of a database file\n" + "\n [--force] restore [SERVER] [DATABASE] < SNAPSHOT\n" diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc index 10d0c0c134..2edf487a28 100755 --- a/ovsdb/ovsdb-doc diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index 8fb91c8..fe5d56d 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 149%{?dist} +Release: 150%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -751,6 +751,12 @@ exit 0 %endif %changelog +* Tue May 07 2024 Open vSwitch CI - 2.17.0-150 +- Merging upstream branch-2.17 [RH git: b910c875a6] + Commit list: + d1a2af7c33 ovsdb-client: Add missing arg to help for 'dump'. + + * Fri May 03 2024 Open vSwitch CI - 2.17.0-149 - Merging upstream branch-2.17 [RH git: 699bf5d1d9] Commit list: