commit a792ba9ab7ce238474a0fa09e5dc0ab4a4b4df06
Merge: 081d35df71 f6757eb214
Author: Open vSwitch CI <ovs-ci@redhat.com>
Date: Fri Jan 19 17:47:24 2024 +0000
Merging upstream branch-3.2
Commit list:
f6757eb214 python: ovs: flow: Add meter_id to controller.
dae1ffc17b python: ovs: flow: Make check_pkt_len action a list.
699d26d425 python: ovs: flow: Add idle_age to openflow flows.
5bef199078 python: tests: Refactor test_odp section testing.
e3f2eca15d python: ovs: flow: Add dp hash and meter actions.
1072d0d221 python: ovs: flow: Add sample to nested actions.
065bdb3e15 python: tests: Add info and key tests for OFPFlows.
4374b1e64e python: ovs: flow: Fix typo in n_packets.
commit 081d35df71f6fce47519b89be2afb941dc06e3f2
Merge: c0b26fd2ea cd8ffc956c
Author: Open vSwitch CI <ovs-ci@redhat.com>
Date: Fri Jan 19 13:02:41 2024 +0000
Merging upstream branch-3.2
Commit list:
cd8ffc956c ovs-atomic: Fix inclusion of Clang header by GCC 14.
b3d094b4fb ovsdb-idl.at: Test IDL behavior during database conversion.
a1935e9628 python: idl: Handle monitor_canceled.
commit c0b26fd2eaf5b889eb87e873e40a1d252d5e3f75
Author: Timothy Redaelli <tredaelli@redhat.com>
Date: Wed Jan 17 11:49:05 2024 +0100
redhat: Fix SyntaxWarnings with Python 3.12
commit ee128f19c0375b819cc543cdf158937d657cfe01
Author: Timothy Redaelli <tredaelli@redhat.com>
Date: Mon Jan 15 18:19:53 2024 +0100
redhat: fix pkgtool for subtree
commit bdacdc328964962347c99e40fd01ba0ac9c5df5d
Author: Timothy Redaelli <tredaelli@redhat.com>
Date: Mon Jan 15 12:34:49 2024 +0100
Fix README.rst to use subtree for dpdk
commit fd97fec96df6201cca2172d244b77dc0a3cc2323
Author: Timothy Redaelli <tredaelli@redhat.com>
Date: Mon Jan 15 12:34:15 2024 +0100
Use subtree for dpdk in redhat/merge
commit aa4e3a2c4c5b250631a3a34dbdfc5d00fcabcce8
Merge: 6e27925dcd 42ed2ce550
Author: Timothy Redaelli <tredaelli@redhat.com>
Date: Mon Jan 15 13:24:07 2024 +0100
Merge commit '42ed2ce550ca14cf939c2e6cc383a54c15878b74' into private-tredaell-subtree
commit 6e27925dcdd9f632fda9944bedb9413bdbec7f23
Merge: fd8549da9d 9dae7a15ae
Author: Timothy Redaelli <tredaelli@redhat.com>
Date: Mon Jan 15 13:23:49 2024 +0100
Add 'dpdk/' from commit '9dae7a15aea76313c592c11db44e1386e85f86fe'
git-subtree-dir: dpdk
git-subtree-mainline: fd8549da9d66b42c117d8eec6af5768507501c01
git-subtree-split: 9dae7a15aea76313c592c11db44e1386e85f86fe
commit fd8549da9d66b42c117d8eec6af5768507501c01
Author: Timothy Redaelli <tredaelli@redhat.com>
Date: Mon Jan 15 12:06:05 2024 +0100
Remove dpdk submodule
You probably also wants to do:
git submodule deinit -f dpdk
rm -rf .git/modules/dpdk
commit cdde3a7096f120265650d4e4057f4a4a9da256fe
Merge: 37c4409b08 946d5ef01e
Author: Open vSwitch CI <ovs-ci@redhat.com>
Date: Tue Jan 9 12:17:37 2024 +0000
Merging upstream branch-3.2
Commit list:
946d5ef01e vconn: Count vconn_sent regardless of log level.
7a307b3563 backtrace: Fix error in log_backtrace() documentation.
ab08bffa32 ovsdb: trigger: Do not allow conversion in read-only mode.
4e74ac6da1 ovsdb: jsonrpc-server: Fix the DSCP value in default options.
04fec86f7a jsonrpc: Sort JSON objects while printing debug messages.
c4d655bc12 tests: ovsdb: Use diff -up format for replay test.
4279901afe ovsdb-server.at: Enbale debug logs in active-backup tests.
8583cdb990 ovsdb: transaction: Don't try to diff unchanged columns.
7d9662345d ovsdb: transaction: Avoid diffs for different type references.
abf5ec4109 ovsdb: Fix incorrect sharing of UUID and _version columns.
commit 37c4409b08b002c8d75e92df5de58b0728e7bc43
Merge: 1304925041 a3a05b7109
Author: Open vSwitch CI <ovs-ci@redhat.com>
Date: Tue Jan 9 07:32:34 2024 +0000
Merging upstream branch-3.2
Commit list:
a3a05b7109 ci: Update the GitHub Ubuntu runner image to Ubuntu 22.04.
commit 1304925041f1390beb48b58bf8f02ce1028473d7
Merge: 3a3bf9bf69 ec1d730163
Author: Open vSwitch CI <ovs-ci@redhat.com>
Date: Thu Jan 4 15:03:06 2024 +0000
Merging upstream branch-3.2
Commit list:
ec1d730163 ovsdb-idl: Preserve change_seqno when deleting rows.