Skip to content

Commit ab5cda0

Browse files
committed
bump Propolis
Changes since the last update: - lib: use correct MAXCPU value in CPUID specializer (#876) - phd: wait for source to resume before asking to migrate again (#874) - phd: add smoke test for VCR replacement (#872) - lib: implement reference TSC enlightenment (#856) - Update package deps for GHSAs - Wire up viona for illumos#17032 - mock-server: add single-step API (#869) - propolis-server should not crash when failing to start a VM (#866) - propolis-cli: check for duplicate spec keys when parsing toml (#865) - various new 1.85 clippy lints (#864) - mock: attempt realistic state transitions (#860) - lib: tidy up overlay page migration & reduce memory usage (#861) - server: add state machine docs (#862) - DTrace script to inspect VM exit reasons (#859) - lib: add better management of Hyper-V overlay pages (#851) - lib: emulate Hyper-V enlightenment stack (#849)
1 parent 7a6144b commit ab5cda0

File tree

3 files changed

+18
-30
lines changed

3 files changed

+18
-30
lines changed

Cargo.lock

Lines changed: 12 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -557,13 +557,10 @@ progenitor-client = "0.9.1"
557557
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
558558
# dependencies, you must also update the references in package-manifest.toml to
559559
# match the new revision.
560-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "95d6a559890c94e3aa62c8adcd7c4e123ec4c6dc" }
561-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "95d6a559890c94e3aa62c8adcd7c4e123ec4c6dc" }
562-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "95d6a559890c94e3aa62c8adcd7c4e123ec4c6dc" }
563-
# NOTE: propolis-mock-server is currently out of sync with other propolis deps,
564-
# but when we update propolis to a commit after 2652487, please just bump this
565-
# as well and delete this comment.
566-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "2652487c19ede2db2cbc634b0dee3a78848dfea1" }
560+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "6b5f2af796a3ea57405721407ab70520a93ec73f" }
561+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "6b5f2af796a3ea57405721407ab70520a93ec73f" }
562+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "6b5f2af796a3ea57405721407ab70520a93ec73f" }
563+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "6b5f2af796a3ea57405721407ab70520a93ec73f" }
567564
# NOTE: see above!
568565
proptest = "1.6.0"
569566
qorb = "0.2.1"

package-manifest.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,10 +622,10 @@ service_name = "propolis-server"
622622
only_for_targets.image = "standard"
623623
source.type = "prebuilt"
624624
source.repo = "propolis"
625-
source.commit = "95d6a559890c94e3aa62c8adcd7c4e123ec4c6dc"
625+
source.commit = "6b5f2af796a3ea57405721407ab70520a93ec73f"
626626
# The SHA256 digest is automatically posted to:
627627
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
628-
source.sha256 = "ea5288f8ae6f3f6039fd3a6b5f7823f6968f273cfc321d7f20ab41c999814217"
628+
source.sha256 = "9a559806cc1a00ca34240fdbc604a36603d2571869d9edd6f3d7843690136100"
629629
output.type = "zone"
630630

631631
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)