Skip to content

Commit

Permalink
Merge branch 'main' into support-bundle-storage-api
Browse files Browse the repository at this point in the history
  • Loading branch information
@smklein
smklein committed Nov 20, 2024
2 parents 2df85ca + a73bc0d commit a17536e
Show file tree
Hide file tree
Showing 24 changed files with 345 additions and 267 deletions.
20 changes: 10 additions & 10 deletions Cargo.lock
View file

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,10 +539,10 @@ prettyplease = { version = "0.2.25", features = ["verbatim"] }
proc-macro2 = "1.0"
progenitor = "0.8.0"
progenitor-client = "0.8.0"
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "aadc0998c0f07f08ab15a95c006074291734800f" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "aadc0998c0f07f08ab15a95c006074291734800f" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "aadc0998c0f07f08ab15a95c006074291734800f" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "aadc0998c0f07f08ab15a95c006074291734800f" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "8f8fbb74662b4e19b643c500d55d2d384a6cee5e" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "8f8fbb74662b4e19b643c500d55d2d384a6cee5e" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "8f8fbb74662b4e19b643c500d55d2d384a6cee5e" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "8f8fbb74662b4e19b643c500d55d2d384a6cee5e" }
proptest = "1.5.0"
qorb = "0.2.0"
quote = "1.0"
Expand Down
20 changes: 10 additions & 10 deletions dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9

sled: 2eb69596-f081-4e2d-9425-9994926e0832 (active)

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down Expand Up @@ -108,7 +108,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9

sled: 32d8d836-4d8a-4e54-8fa9-f31d79c42646 (active)

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down Expand Up @@ -147,7 +147,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9

sled: 89d02b1b-478c-401a-8e28-7a26f74fa41b (active)

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down Expand Up @@ -205,7 +205,7 @@ to: blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a

sled 2eb69596-f081-4e2d-9425-9994926e0832 (active):

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down Expand Up @@ -297,7 +297,7 @@ to: blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a

sled 32d8d836-4d8a-4e54-8fa9-f31d79c42646 (active):

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down Expand Up @@ -386,7 +386,7 @@ to: blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a

sled 89d02b1b-478c-401a-8e28-7a26f74fa41b (active):

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down Expand Up @@ -495,7 +495,7 @@ to: blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a

sled 2eb69596-f081-4e2d-9425-9994926e0832 (active):

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down Expand Up @@ -587,7 +587,7 @@ to: blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a

sled 32d8d836-4d8a-4e54-8fa9-f31d79c42646 (active):

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down Expand Up @@ -676,7 +676,7 @@ to: blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a

sled 89d02b1b-478c-401a-8e28-7a26f74fa41b (active):

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down Expand Up @@ -820,7 +820,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9

sled: 89d02b1b-478c-401a-8e28-7a26f74fa41b (active)

physical disks at generation 1:
physical disks at generation 2:
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
Expand Down
Loading

0 comments on commit a17536e

Please sign in to comment.