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

fix: fix --log_format flag not working (backport #14441) #14443

Merged
merged 4 commits into from
Dec 29, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 29, 2022

This is an automatic backport of pull request #14441 done by Mergify.
Cherry-pick of 82bd888 has failed:

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

You are currently cherry-picking commit 82bd8880f.
  (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:   server/util.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

(cherry picked from commit 82bd888)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner December 29, 2022 09:09
@mergify mergify bot added the conflicts label Dec 29, 2022
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@julienrbrt julienrbrt enabled auto-merge (squash) December 29, 2022 09:17
@julienrbrt julienrbrt merged commit 2542d16 into release/v0.47.x Dec 29, 2022
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14441 branch December 29, 2022 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants