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

Testing: fix block proposer and allow Default gas to be modified (backport #2657) #2683

Merged
merged 2 commits into from
Nov 5, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 4, 2022

This is an automatic backport of pull request #2657 done by Mergify.
Cherry-pick of f69761d has failed:

On branch mergify/bp/release/v5.1.x/pr-2657
Your branch is up to date with 'origin/release/v5.1.x'.

You are currently cherry-picking commit f69761d.
  (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:   testing/chain.go
	modified:   testing/simapp/helpers/test_helpers.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

…#2657)

* carry block proposer, and allow Default gas to be modified

* add changelog entry

Co-authored-by: Federico Kunze Küllmer <[email protected]>
Co-authored-by: colin axnér <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
(cherry picked from commit f69761d)

# Conflicts:
#	CHANGELOG.md
CHANGELOG.md Outdated Show resolved Hide resolved
@crodriguezvega crodriguezvega merged commit 035e174 into release/v5.1.x Nov 5, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v5.1.x/pr-2657 branch November 5, 2022 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants