Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into add-stacker-and-recursive
# Conflicts:
#	datafusion-cli/Cargo.lock
#	datafusion/optimizer/Cargo.toml
  • Loading branch information
peter-toth committed Nov 10, 2024
commit cd57de936a31d194e5ebc9539f099216752e01c4
1 change: 1 addition & 0 deletions datafusion-cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions datafusion/optimizer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ itertools = { workspace = true }
log = { workspace = true }
paste = "1.0.14"
recursive = { workspace = true }
regex = { workspace = true }
regex-syntax = "0.8.0"

[dev-dependencies]
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.