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

feat: add custom max gas for block for sim config (backport #16656) #16730

Merged
merged 2 commits into from
Jun 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 27, 2023

This is an automatic backport of pull request #16656 done by Mergify.
Cherry-pick of 9b2fd7b has failed:

On branch mergify/bp/release/v0.47.x/pr-16656
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit 9b2fd7bad.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.md
	modified:   types/simulation/config.go
	modified:   x/simulation/simulate.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/simulation/params.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 9b2fd7b)

# Conflicts:
#	x/simulation/params.go
@mergify mergify bot requested a review from a team as a code owner June 27, 2023 23:03
@mergify mergify bot added the conflicts label Jun 27, 2023
x/simulation/params.go Outdated Show resolved Hide resolved
@facundomedica facundomedica enabled auto-merge (squash) June 28, 2023 09:00
@facundomedica facundomedica merged commit d681010 into release/v0.47.x Jun 28, 2023
23 of 25 checks passed
@facundomedica facundomedica deleted the mergify/bp/release/v0.47.x/pr-16656 branch June 28, 2023 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

4 participants