Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 11, 2025

This adds links to the Windows samples added by @VihasMakwana in #10540.

Fixes https://github.com/elastic/opentelemetry-dev/issues/1113


This is an automatic backport of pull request #10918 done by Mergify.

(cherry picked from commit 3bce814)

# Conflicts:
#	docs/reference/edot-collector/custom-collector.md
#	docs/reference/edot-collector/download.md
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 11, 2025
@mergify mergify bot requested a review from a team as a code owner November 11, 2025 14:57
@mergify mergify bot requested review from blakerouse and michalpristas and removed request for a team November 11, 2025 14:57
@mergify
Copy link
Contributor Author

mergify bot commented Nov 11, 2025

Cherry-pick of 3bce814 has failed:

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

You are currently cherry-picking commit 3bce8148d.
  (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/reference/edot-collector/config/default-config-standalone.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/reference/edot-collector/custom-collector.md
	deleted by us:   docs/reference/edot-collector/download.md

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

@vishaangelova
Copy link
Contributor

@theletterf the automatic backport doesn’t work for the 8.19 branch, can you update the asciidoc files?

@mergify
Copy link
Contributor Author

mergify bot commented Nov 17, 2025

This pull request has not been merged yet. Could you please review and merge it @theletterf? 🙏

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 docs skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants