rust-extensions
rust-extensions copied to clipboard
add exec delete timeout
add exec delete timeout
@mingfukuang you'll need to rebase off main to pull in changes to make CI checks happy across your PRs
@mingfukuang you'll need to rebase off
mainto pull in changes to make CI checks happy across your PRs
It's done , pls have a look. thanks.
the GitHub UI is still showing that there are merge conflicts, and it looks like your diff contains a lot of prior changes that are already on main
conflicts exists at here:
[dependencies]
async-trait = { workspace = true, optional = true }
<<<<<<< f7
protobuf = "=3.1"
=======
protobuf = "=3.5"
>>>>>>> main
ttrpc = "0.8"
but this conflicts could be still exists in commit 6a5c9c26295b1e2c1eb14aa1b22edb17f0b07f86:
crates/shim-protos/Cargo.toml :
$ git reset --hard 6a5c9c26295b1e2c1eb14aa1b22edb17f0b07f86
HEAD now 6a5c9c2 fix: Correct clippy lint suggestion part tres
$ cat crates/shim-protos/Cargo.toml |grep protobuf
protobuf = "=3.1"
I'm not sure how to handle it properly.
This PR is stale because it has been open 90 days with no activity. This PR will be closed in 7 days unless new comments are made or the stale label is removed.
This PR was closed because it has been stalled for 7 days with no activity.