Skip to content

Commit

Permalink
Merge branch 'main' into bump_zip
Browse files Browse the repository at this point in the history
Signed-off-by: Felix Obenhuber <[email protected]>
  • Loading branch information
flxo authored Jul 9, 2024
2 parents 2b8e157 + 599885f commit 4391d8f
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 59 deletions.
100 changes: 48 additions & 52 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion examples/test-container/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ anyhow = { version = "1.0.80", features = ["backtrace"] }
caps = "0.5.5"
clap = { version = "4.4.18", features = ["derive"] }
nix = { version = "0.29.0", default-features = false, features = ["process", "user"] }
socket2 = { version = "0.5.6", features = ["all"] }
socket2 = { version = "0.5.7", features = ["all"] }

[package.metadata.npk]
manifest = "manifest.yaml"
Expand Down
Loading

0 comments on commit 4391d8f

Please sign in to comment.