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

override QueryFnName (backport #4132) #4163

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2023

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

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

You are currently cherry-picking commit e15fc6b1.
  (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:   osmoutils/osmocli/query_cmd_wrap.go
	modified:   x/gamm/client/cli/query.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x/poolmanager/client/cli/query.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

@mergify mergify bot added the conflicts label Jan 31, 2023
@github-actions github-actions bot added C:CLI C:x/gamm Changes, features and bugs related to the gamm module. labels Jan 31, 2023
@p0mvn p0mvn force-pushed the mergify/bp/v14.x/pr-4132 branch from 5a5826c to 4305bc6 Compare January 31, 2023 04:31
@p0mvn p0mvn merged commit 1fe3844 into v14.x Jan 31, 2023
@p0mvn p0mvn deleted the mergify/bp/v14.x/pr-4132 branch January 31, 2023 04:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI 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.

2 participants