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 Polkadot SDK #28

Merged
merged 260 commits into from
Nov 15, 2023
Merged

Update Polkadot SDK #28

merged 260 commits into from
Nov 15, 2023

Conversation

vgeddes
Copy link

@vgeddes vgeddes commented Nov 14, 2023

Snowbridge companion: Snowfork/snowbridge#1008

alistair-singh and others added 18 commits November 10, 2023 18:59
Companion for snowbridge #1003
# Conflicts:
#	cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
#	cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
#	polkadot/xcm/pallet-xcm/src/benchmarking.rs
#	polkadot/xcm/pallet-xcm/src/lib.rs
# Conflicts:
#	Cargo.lock
#	cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
#	cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/snowbridge.rs
#	cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
#	cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
@vgeddes vgeddes changed the base branch from snowbridge to master November 14, 2023 13:21
@vgeddes vgeddes changed the title Message queue compatibility Update Polkadot SDK (Vincent's version) Nov 14, 2023
@claravanstaden claravanstaden changed the title Update Polkadot SDK (Vincent's version) Update Polkadot SDK Nov 15, 2023
@claravanstaden claravanstaden merged commit 0362047 into master Nov 15, 2023
4 of 9 checks passed
@claravanstaden claravanstaden deleted the message-queue-compatibility branch November 15, 2023 09:49
claravanstaden added a commit that referenced this pull request Nov 15, 2023
@claravanstaden claravanstaden restored the message-queue-compatibility branch November 15, 2023 09:50
@claravanstaden claravanstaden deleted the message-queue-compatibility branch December 4, 2023 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants