From d650f693daadf9f1ce6f0d7429a92ecb12227bc8 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: May 07 2024 21:40:23 +0000
Subject: Import openvswitch3.2-3.2.0-77 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch
index 7b76ba1..6b51960 100644
--- a/SOURCES/openvswitch-3.2.0.patch
+++ b/SOURCES/openvswitch-3.2.0.patch
@@ -4678,6 +4678,22 @@ index 01091fabe7..f4a9cf8fe3 100644
      ovsdb_condition_diff(&mtc->diff_condition,
                           &mtc->old_condition, &mtc->new_condition);
      ovsdb_monitor_condition_add_columns(dbmon,
+diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c
+index 46484630d2..f75292fb0b 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.2.spec b/SPECS/openvswitch3.2.spec
index 1fc69cf..c310317 100644
--- a/SPECS/openvswitch3.2.spec
+++ b/SPECS/openvswitch3.2.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.2.0
-Release: 76%{?dist}
+Release: 77%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -761,6 +761,12 @@ exit 0
 %endif
 
 %changelog
+* Tue May 07 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-77
+- Merging upstream branch-3.2 [RH git: 875358dc66]
+    Commit list:
+    a3f9c5ae1b ovsdb-client: Add missing arg to help for 'dump'.
+
+
 * Fri May 03 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-76
 - Merging upstream branch-3.2 [RH git: 242679aa6d]
     Commit list: