Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
Conflicts:
      Cargo.lock
  • Loading branch information
nick1udwig committed Jun 10, 2024
2 parents 6e3c4da + 784dda5 commit d55cf3c
Show file tree
Hide file tree
Showing 5 changed files with 372 additions and 0 deletions.
158 changes: 158 additions & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ futures-util = "0.3"
hex = "0.4"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib.git", rev = "7eb3a04" }
nix = { version = "0.27", features = ["process", "signal", "term"] }
procfs = "0.16"
regex = "1"
reqwest = { version = "0.11", features = ["json"] }
rmp-serde = "1.1.2"
semver = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
sha2 = "0.10.8"
ssh2 = "0.9.4"
thiserror = "1.0"
tokio = { version = "1.28", features = [
"fs",
Expand Down
Loading

0 comments on commit d55cf3c

Please sign in to comment.