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.9](backport #3326) [synthetics] Add locations and private_locations lightweight options #3338

Merged
merged 2 commits into from
Nov 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 6, 2023

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

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

You are currently cherry-picking commit a2f6d5e4.
  (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-configuration.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/observability/synthetics-reference/lightweight-config/common.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

…ons (#3326)

* add locations and private_locations lightweight options

* address feedback

* apply suggestions from code review

Co-authored-by: DeDe Morton <[email protected]>

* update link

---------

Co-authored-by: DeDe Morton <[email protected]>
(cherry picked from commit a2f6d5e)

# Conflicts:
#	docs/en/observability/synthetics-reference/lightweight-config/common.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 6, 2023
Copy link
Contributor

github-actions bot commented Nov 6, 2023

A documentation preview will be available soon:

@colleenmcginnis colleenmcginnis enabled auto-merge (squash) November 6, 2023 15:17
@colleenmcginnis colleenmcginnis merged commit 93d4ce1 into 8.9 Nov 6, 2023
1 check passed
@colleenmcginnis colleenmcginnis deleted the mergify/bp/8.9/pr-3326 branch November 6, 2023 18:01
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