Merge main (delivery 1, the parse-only sdk) into L3's re-land, and pin mesh-sdk 2da0de7, the release's final head (issue 774)
mesh/delivery ready: it is merged on the Approve
mesh/check failed: shanks: novox/mesh-catalog#560: modules/mesh-build-image/mesh-build-image: a compiled program added in 17588fee10f8 and removed lat…
mesh/delivery-group group feat/774-l3-reland rejected: composed together: the checker's verdict at the members' heads (fc2ace3a8f88): shanks
mesh/delivery ready: it is merged on the Approve
mesh/check failed: shanks: novox/mesh-catalog#560: modules/mesh-build-image/mesh-build-image: a compiled program added in 17588fee10f8 and removed lat…
mesh/delivery-group group feat/774-l3-reland rejected: composed together: the checker's verdict at the members' heads (fc2ace3a8f88): shanks
The conflicts were go.mod, go.sum and testdata/beside/CAPTURED alone, taken from the release. 2da0de7 is 6e4a301's code; its conformance events are unchanged.
This commit is contained in:
Vendored
+1
-1
@@ -9,7 +9,7 @@ a second place to clean besides the catalogue itself.
|
||||
|
||||
mesh-catalog 8ae8e88dddc86c646de4d1be35919d109ab4c779 modules/*/module.json, modules/*/files, modules/*/templates, predefined.json
|
||||
mesh-host 9d9e3a46c4f5943cfffb413d962ce48b75e2fd39 examples/foundation-first-node.lock
|
||||
mesh-sdk 6e4a3014cbde924dcd24158369cbe9ad287ce2c9 conformance/events/module-event.json
|
||||
mesh-sdk 2da0de75c3f0087cff9c2f5ef789ca6dc3c59045 conformance/events/module-event.json
|
||||
|
||||
To move them, from this repository's root, with the two repositories checked out beside it:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user