rust-extensions icon indicating copy to clipboard operation
rust-extensions copied to clipboard

add exec delete timeout

Open mingfukuang opened this issue 1 year ago • 4 comments

add exec delete timeout

mingfukuang avatar Jul 30 '24 11:07 mingfukuang

@mingfukuang you'll need to rebase off main to pull in changes to make CI checks happy across your PRs

bryantbiggs avatar Jul 30 '24 17:07 bryantbiggs

@mingfukuang you'll need to rebase off main to pull in changes to make CI checks happy across your PRs

It's done , pls have a look. thanks.

mingfukuang avatar Aug 03 '24 06:08 mingfukuang

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

bryantbiggs avatar Aug 03 '24 12:08 bryantbiggs

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.

mingfukuang avatar Aug 05 '24 01:08 mingfukuang

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.

github-actions[bot] avatar Jan 09 '25 00:01 github-actions[bot]

This PR was closed because it has been stalled for 7 days with no activity.

github-actions[bot] avatar Feb 11 '25 00:02 github-actions[bot]