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

[8.8](backport #3382) Add documentation clarification #3384

Merged
merged 2 commits into from
Nov 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 28, 2023

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

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

You are currently cherry-picking commit 3271331b.
  (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:   docs/en/observability/synthetics-create-test.asciidoc
	modified:   docs/en/observability/synthetics-reference/lightweight-config/http.asciidoc
	modified:   docs/en/observability/synthetics-reference/lightweight-config/icmp.asciidoc
	modified:   docs/en/observability/synthetics-reference/lightweight-config/tcp.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/observability/synthetics-configuration.asciidoc

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

* Update how hosts and ports are configured
* Add that monitors cannot be run headful

(cherry picked from commit 3271331)

# Conflicts:
#	docs/en/observability/synthetics-configuration.asciidoc
@mergify mergify bot requested a review from a team as a code owner November 28, 2023 12:37
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 28, 2023
@mergify mergify bot requested review from alaudazzi and mdbirnstiehl and removed request for a team November 28, 2023 12:37
Copy link
Contributor

A documentation preview will be available soon:

@colleenmcginnis colleenmcginnis removed the conflicts There is a conflict in the backported pull request label Nov 28, 2023
@colleenmcginnis colleenmcginnis merged commit da64aa0 into 8.8 Nov 28, 2023
3 checks passed
@colleenmcginnis colleenmcginnis deleted the mergify/bp/8.8/pr-3382 branch November 28, 2023 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants