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(recurring-job): flooded source label log (backport #2058) #2061

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 10, 2023

This is an automatic backport of pull request #2058 done by Mergify.
Cherry-pick of 73e92f7 has failed:

On branch mergify/bp/v1.4.x/pr-2058
Your branch is up to date with 'origin/v1.4.x'.

You are currently cherry-picking commit 73e92f70.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller/volume_controller.go

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 2c5b623 has failed:

On branch mergify/bp/v1.4.x/pr-2058
Your branch is ahead of 'origin/v1.4.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2c5b6234.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   types/setting.go

no changes added to commit (use "git add" and/or "git commit -a")

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

ref: 6257

Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
(cherry picked from commit 73e92f7)

# Conflicts:
#	controller/volume_controller.go
Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
(cherry picked from commit 2c5b623)

# Conflicts:
#	types/setting.go
@c3y1huang
Copy link
Contributor

No need to backport this since this log is introduced in v1.5.0.

cc @innobead

@c3y1huang c3y1huang closed this Jul 10, 2023
@mergify mergify bot deleted the mergify/bp/v1.4.x/pr-2058 branch July 10, 2023 02:59
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.

1 participant