Skip to content
This repository was archived by the owner on Feb 29, 2024. It is now read-only.

Pick polkadot-v0.9.33 to main#238

Merged
jiguantong merged 1 commit into
mainfrom
pick-0933
Jan 17, 2023
Merged

Pick polkadot-v0.9.33 to main#238
jiguantong merged 1 commit into
mainfrom
pick-0933

Conversation

@jiguantong
Copy link
Copy Markdown
Contributor

This reverts commit 926b32d.

This reverts commit b96b41c.

This reverts commit 4c5865d.

  • Fix compile

  • format

  • Fix test

  • Fix dispatch test

  • Try fix compile with darwinia-2.0

  • Revert "Try fix compile with darwinia-2.0"

This reverts commit c9dcd67.

  • Update prepare branch

  • Format

  • Remove unused trait

  • Remove unused import

* Anchor polkadot-v0.9.32

* fix parity-util-mem conflict

* Anchor polkadot-v0.9.33

* Companion for paritytech/parity-bridges-common#1613

* Companion for paritytech/parity-bridges-common#1616

* Companion for paritytech/parity-bridges-common#1619

* Companion for paritytech/parity-bridges-common#1623

* Companion for paritytech/parity-bridges-common#1622

* Companion for paritytech/parity-bridges-common#1655

* Companion for paritytech/parity-bridges-common#1670

* Companion for paritytech/parity-bridges-common#1690

* Correct cargo

* Revert "Companion for paritytech/parity-bridges-common#1690"

This reverts commit 926b32d.

* Revert "Companion for paritytech/parity-bridges-common#1670"

This reverts commit b96b41c.

* Fix compile

* Revert "Companion for paritytech/parity-bridges-common#1622"

This reverts commit 4c5865d.

* Fix compile

* format

* Fix test

* Fix dispatch test

* Try fix compile with darwinia-2.0

* Revert "Try fix compile with darwinia-2.0"

This reverts commit c9dcd67.

* Update prepare branch

* Format

* Remove unused trait

* Remove unused import
@jiguantong jiguantong enabled auto-merge (squash) January 17, 2023 09:50
@jiguantong jiguantong requested a review from aurexav January 17, 2023 09:56
@jiguantong jiguantong merged commit e5ec426 into main Jan 17, 2023
@jiguantong jiguantong deleted the pick-0933 branch January 17, 2023 09:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants