Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dendrite to d58b59b #4729

Merged
merged 23 commits into from
Feb 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
08e5efa
Update with latest version
oxide-reflector-bot[bot] Dec 22, 2023
478c042
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Jan 9, 2024
77012ab
Update with latest version
oxide-reflector-bot[bot] Jan 9, 2024
f9a72c9
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Jan 13, 2024
36e432b
Update with latest version
oxide-reflector-bot[bot] Jan 13, 2024
ce21725
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Jan 17, 2024
527b1aa
Update with latest version
oxide-reflector-bot[bot] Jan 17, 2024
036f857
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Jan 20, 2024
0f42a82
Update with latest version
oxide-reflector-bot[bot] Jan 20, 2024
afd45c5
Update with latest version
oxide-reflector-bot[bot] Jan 22, 2024
269005f
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Jan 23, 2024
e41e818
Update with latest version
oxide-reflector-bot[bot] Jan 23, 2024
fbd13dc
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Jan 27, 2024
4f009d3
Update with latest version
oxide-reflector-bot[bot] Jan 27, 2024
745bba7
Update with latest version
oxide-reflector-bot[bot] Jan 27, 2024
b9c0439
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Jan 29, 2024
4d7f88c
Update with latest version
oxide-reflector-bot[bot] Jan 29, 2024
60154af
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Jan 31, 2024
f075a8f
Update with latest version
oxide-reflector-bot[bot] Jan 31, 2024
9f53b5b
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Feb 1, 2024
d1c5444
Update with latest version
oxide-reflector-bot[bot] Feb 1, 2024
545eefc
Merge branch 'main' into dendrite-integration
oxide-reflector-bot[bot] Feb 10, 2024
3ac1010
Update with latest version
oxide-reflector-bot[bot] Feb 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,8 @@ only_for_targets.image = "standard"
# 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
source.type = "prebuilt"
source.repo = "dendrite"
source.commit = "fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
source.sha256 = "1e24598ba77dc00682cdf54fc370696ef5aa49ed510ab7f72fcc91d61d679e7b"
source.commit = "d58b59b2682183855cdf137ab86a298ecdaaf697"
source.sha256 = "d48408ac1c12332c0bf95834a9372f20d9ff53efa1d79513ea868f616a91cb97"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -522,8 +522,8 @@ only_for_targets.image = "standard"
# 2. Copy the output zone image from dendrite/out to omicron/out
source.type = "prebuilt"
source.repo = "dendrite"
source.commit = "fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
source.sha256 = "720df8aff3aaa0f8a86ec606089ebf8b5068d7f3c243bd4c868b96ef72d13485"
source.commit = "d58b59b2682183855cdf137ab86a298ecdaaf697"
source.sha256 = "fb1b276c48d320a129376f8d574f61474734de20ed3e6f90408c56a3d205c597"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -540,8 +540,8 @@ only_for_targets.image = "standard"
# 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
source.type = "prebuilt"
source.repo = "dendrite"
source.commit = "fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
source.sha256 = "5e34a10d9dca6c94f96075140d42b755dee1f5e6a3485fc239b12e12b89a30c5"
source.commit = "d58b59b2682183855cdf137ab86a298ecdaaf697"
source.sha256 = "197ed4e1fde14062bf6ae037895c72571b028078ff5691591aec3ad063cad3ea"
output.type = "zone"
output.intermediate_only = true

Expand Down
4 changes: 2 additions & 2 deletions tools/dendrite_openapi_version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
COMMIT="fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
SHA2="e8f73a83d5c62f7efce998f821acc80a91b7995c95bd9ec2c228372829310099"
COMMIT="d58b59b2682183855cdf137ab86a298ecdaaf697"
SHA2="aa670165e5b459fab4caba36ae4d382a09264ff5cf6a2dac0dae0a0db39a378e"
6 changes: 3 additions & 3 deletions tools/dendrite_stub_checksums
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CIDL_SHA256_ILLUMOS="1e24598ba77dc00682cdf54fc370696ef5aa49ed510ab7f72fcc91d61d679e7b"
CIDL_SHA256_LINUX_DPD="4fc43b53a048264664ede64805d4d179ec32d50cf9ab1aaa0fa4e17190e511a2"
CIDL_SHA256_LINUX_SWADM="0ab34a2063e68568aa064f7b71825a603d47b3e399f3e7f45976edb5d5283f0f"
CIDL_SHA256_ILLUMOS="d48408ac1c12332c0bf95834a9372f20d9ff53efa1d79513ea868f616a91cb97"
CIDL_SHA256_LINUX_DPD="b6d45d713a879f1d03422eb0bbfa33767da776b05b0d5fbb855b602974ceba01"
CIDL_SHA256_LINUX_SWADM="b7e737be56a8a815a95624f0b5c42ce1e339b07feeae7b3d7b9b4bc17c204245"
Loading