From 4ec8d2f5d54b64a13fe158ca536f6e75b7d0a5c9 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: May 07 2024 20:33:49 +0000
Subject: Import openvswitch3.1-3.1.0-108 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index f7b8ef7..c8eb735 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -8653,6 +8653,22 @@ index 191befcae3..34aea54520 100644
          basis = hash_pointer(mt->table, basis);
          basis = hash_3words(mt->select, mt->n_columns, basis);
  
+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 f102945..04b28bb 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.0
-Release: 107%{?dist}
+Release: 108%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -754,6 +754,12 @@ exit 0
 %endif
 
 %changelog
+* Tue May 07 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-108
+- Merging upstream branch-3.1 [RH git: fb3f5d6c8f]
+    Commit list:
+    8b029bd258 ovsdb-client: Add missing arg to help for 'dump'.
+
+
 * Fri May 03 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-107
 - Merging upstream branch-3.1 [RH git: f4e3fb5322]
     Commit list: