Skip to content

Commit

Permalink
Merge branch 'main' into ntwk-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rcgoodfellow committed Nov 29, 2023
2 parents 20e8cf7 + bb7ee84 commit a40c1f6
Show file tree
Hide file tree
Showing 36 changed files with 935 additions and 141 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/hakari.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
toolchain: stable
- name: Install cargo-hakari
uses: taiki-e/install-action@8f354f35e51028c902e8ab954045e37739acf562 # v2
uses: taiki-e/install-action@f7c663c03b51ed0d93e9cec22a575d3f02175989 # v2
with:
tool: cargo-hakari
- name: Check workspace-hack Cargo.toml is up-to-date
Expand Down
57 changes: 35 additions & 22 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ byteorder = "1.5.0"
bytes = "1.5.0"
bytesize = "1.3.0"
camino = "1.1"
camino-tempfile = "1.0.2"
camino-tempfile = "1.1.1"
cancel-safe-futures = "0.1.5"
chacha20poly1305 = "0.10.1"
ciborium = "0.2.1"
Expand Down Expand Up @@ -282,13 +282,13 @@ p256 = "0.13"
parse-display = "0.8.2"
partial-io = { version = "0.5.4", features = ["proptest1", "tokio1"] }
paste = "1.0.14"
percent-encoding = "2.3.0"
percent-encoding = "2.3.1"
pem = "1.1"
petgraph = "0.6.4"
postgres-protocol = "0.6.6"
predicates = "3.0.4"
pretty_assertions = "1.4.0"
pretty-hex = "0.3.0"
pretty-hex = "0.4.0"
proc-macro2 = "1.0"
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
Expand Down Expand Up @@ -389,7 +389,7 @@ walkdir = "2.4"
wicket = { path = "wicket" }
wicket-common = { path = "wicket-common" }
wicketd-client = { path = "clients/wicketd-client" }
zeroize = { version = "1.6.0", features = ["zeroize_derive", "std"] }
zeroize = { version = "1.7.0", features = ["zeroize_derive", "std"] }
zip = { version = "0.6.6", default-features = false, features = ["deflate","bzip2"] }
zone = { version = "0.3", default-features = false, features = ["async"] }

Expand Down
1 change: 1 addition & 0 deletions illumos-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ async-trait.workspace = true
bhyve_api.workspace = true
byteorder.workspace = true
camino.workspace = true
camino-tempfile.workspace = true
cfg-if.workspace = true
crucible-smf.workspace = true
futures.workspace = true
Expand Down
Loading

0 comments on commit a40c1f6

Please sign in to comment.