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

[7.16] Fix inventory threshold rule preview description (backport #3941) #3946

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 30, 2024

Closes #3880

* Fix inventory threshold rule preview description

* Apply changes from review

(cherry picked from commit 17d170b)

# Conflicts:
#	docs/en/observability/images/inventory-alert.png
#	docs/en/observability/inventory-threshold-alert.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 30, 2024
Copy link
Contributor Author

mergify bot commented May 30, 2024

Cherry-pick of 17d170b has failed:

On branch mergify/bp/7.16/pr-3941
Your branch is up to date with 'origin/7.16'.

You are currently cherry-picking commit 17d170ba.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   docs/en/observability/images/inventory-alert.png
	deleted by us:   docs/en/observability/inventory-threshold-alert.asciidoc

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@dedemorton
Copy link
Contributor

Closing because backporting to this branch is not required as indicated in our backporting policy.

@dedemorton dedemorton closed this May 30, 2024
@mergify mergify bot deleted the mergify/bp/7.16/pr-3941 branch May 30, 2024 23:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant