Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

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

Merged
merged 3 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/v6.0.x/pr-2657
Your branch is up to date with 'origin/release/v6.0.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 <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit f69761d)

# Conflicts:
#	CHANGELOG.md
@crodriguezvega crodriguezvega merged commit 370b533 into release/v6.0.x Nov 5, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v6.0.x/pr-2657 branch November 5, 2022 12:49
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants