Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Revert orchestra update #6916

Merged
merged 1 commit into from
Mar 20, 2023
Merged

Conversation

vstakhov
Copy link
Contributor

@vstakhov vstakhov commented Mar 20, 2023

Reverts #6854

Fixes paritytech/polkadot-sdk#689

Cumulus companion: paritytech/cumulus#2349

@vstakhov vstakhov added A0-please_review Pull request needs code review. U1-asap No need to stop dead in your tracks, however issue should be addressed as soon as possible. C1-low PR touches the given topic and has a low impact on builders. labels Mar 20, 2023
@vstakhov vstakhov added the B0-silent Changes should not be mentioned in any release notes label Mar 20, 2023
@vstakhov
Copy link
Contributor Author

Cumulus job is failing for an unrelated issue.

@vstakhov
Copy link
Contributor Author

bot merge

@paritytech-processbot
Copy link

Error: "Check reviews" status is not passing for paritytech/cumulus#2349

@vstakhov vstakhov closed this Mar 20, 2023
@vstakhov vstakhov reopened this Mar 20, 2023
@vstakhov vstakhov merged commit 7dea636 into master Mar 20, 2023
@vstakhov vstakhov deleted the revert-6854-vstakhov-update-orchestra branch March 20, 2023 15:08
@ordian
Copy link
Member

ordian commented Mar 20, 2023

@vstakhov please merge PRs with companions with bot. Currently, we have a hanging unmerged companion which will block other PRs: paritytech/cumulus#2349. This is a problem, because there's another unmerged companion: paritytech/cumulus#2334

@ggwpez
Copy link
Member

ggwpez commented Mar 20, 2023

I guess in this case the Currency MR should go green since it is not rebased on this one.

ordian added a commit that referenced this pull request Mar 21, 2023
* master:
  kusama: enable dispute slashes (#5974)
  Introduce OpenGov into Polkadot (#6701)
  introduce new well known key (#6915)
  [CI] Add bootnode checking CI jobs (#6889)
  Bump parity-db (#6921)
  Handling timers for repeat dispute participation requests (#6901)
  [Companion #13634] keystore overhaul (iter2) (#6913)
  tweak some pattern matches to address a new clippy warning
  Bump ci-linux image for rust 1.68
  Revert "Update orchestra to the recent version (#6854)" (#6916)
  Deprecate Currency: Companion for #12951 (#6780)
  changelog: template fixup (#6907)
  [Companion #13615] Keystore overhaul (#6892)
  update weights (#6897)
  Fix approval voting test (#6898)
  parachains-runtime: Less cloning! (#6896)
  Testing Reversion Speed on Dispute Concluded Against (#6880)
  remove duplicated arm and fix version index (#6884)
ordian added a commit that referenced this pull request Mar 21, 2023
* master:
  kusama: enable dispute slashes (#5974)
  Introduce OpenGov into Polkadot (#6701)
  introduce new well known key (#6915)
  [CI] Add bootnode checking CI jobs (#6889)
  Bump parity-db (#6921)
  Handling timers for repeat dispute participation requests (#6901)
  [Companion #13634] keystore overhaul (iter2) (#6913)
  tweak some pattern matches to address a new clippy warning
  Bump ci-linux image for rust 1.68
  Revert "Update orchestra to the recent version (#6854)" (#6916)
  Deprecate Currency: Companion for #12951 (#6780)
  changelog: template fixup (#6907)
  [Companion #13615] Keystore overhaul (#6892)
  update weights (#6897)
  Fix approval voting test (#6898)
  parachains-runtime: Less cloning! (#6896)
  Testing Reversion Speed on Dispute Concluded Against (#6880)
  remove duplicated arm and fix version index (#6884)
@vstakhov
Copy link
Contributor Author

@vstakhov please merge PRs with companions with bot. Currently, we have a hanging unmerged companion which will block other PRs: paritytech/cumulus#2349.

Got it, thank you! I was under impression that bot merge is required merely from a dependent PR side (cumulus in this case).

@Polkadot-Forum
Copy link

This pull request has been mentioned on Polkadot Forum. There might be relevant details there:

https://forum.polkadot.network/t/polkadot-release-analysis-v0-9-41-v0-9-42/2828/1

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. U1-asap No need to stop dead in your tracks, however issue should be addressed as soon as possible.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dispute-coordinator: subsystem stalls during dispute load test
5 participants