diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index a8327e8..9ff7a6b 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -8549,6 +8549,22 @@ index 191befcae3..bf5d083cc5 100644 } else if (mcs == dbmon->new_change_set) { dbmon->new_change_set = NULL; } +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/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index f253251..64f5742 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: 115%{?dist} +Release: 116%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -757,6 +757,12 @@ exit 0 %endif %changelog +* Tue May 07 2024 Open vSwitch CI - 3.1.0-116 +- Merging upstream branch-3.1 [RH git: db9b177b3e] + Commit list: + 8b029bd258 ovsdb-client: Add missing arg to help for 'dump'. + + * Fri May 03 2024 Open vSwitch CI - 3.1.0-115 - Merging upstream branch-3.1 [RH git: 76b4091dc6] Commit list: