Merge remote-tracking branch 'upstream/main' into feature/9421

# Conflicts: # datafusion/proto/src/logical_plan/from_proto.rs
Omega359 · Mar 3, 2024 · 35f8e36 · 35f8e36
2 parents 2a41960 + c43d9b3
commit 35f8e36
Show file tree

Hide file tree

Showing 20 changed files with 501 additions and 438 deletions.
diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock