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

refactor(gamm): improve error handling and messages when parsing pool assets (backport #2804) #2901

Merged
merged 3 commits into from
Oct 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 29, 2022

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

On branch mergify/bp/v12.x/pr-2804
Your branch is up to date with 'origin/v12.x'.

You are currently cherry-picking commit f024498f.
  (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:   x/gamm/pool-models/balancer/pool.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

@mergify mergify bot requested a review from a team September 29, 2022 18:20
@mergify mergify bot added the conflicts label Sep 29, 2022
@mergify mergify bot assigned p0mvn Sep 29, 2022
@github-actions github-actions bot added C:docs Improvements or additions to documentation C:x/gamm Changes, features and bugs related to the gamm module. labels Sep 29, 2022
@p0mvn p0mvn force-pushed the mergify/bp/v12.x/pr-2804 branch from 5475f5e to 9ecd8e0 Compare September 30, 2022 16:48
CHANGELOG.md Show resolved Hide resolved
@p0mvn p0mvn merged commit 06c9c84 into v12.x Oct 1, 2022
@p0mvn p0mvn deleted the mergify/bp/v12.x/pr-2804 branch October 1, 2022 01:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:docs Improvements or additions to documentation C:x/gamm Changes, features and bugs related to the gamm module. conflicts
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant