Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2025

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


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

* Add batching config docs

* Tech review edits

(cherry picked from commit 01936d2)

# Conflicts:
#	docs/reference/edot-collector/config/default-config-standalone.md
@mergify mergify bot requested a review from a team as a code owner October 16, 2025 15:44
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 16, 2025
@mergify mergify bot requested review from kaanyalti and michalpristas and removed request for a team October 16, 2025 15:44
@mergify mergify bot added the backport label Oct 16, 2025
Copy link
Contributor Author

mergify bot commented Oct 16, 2025

Cherry-pick of 01936d2 has failed:

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

You are currently cherry-picking commit 01936d2da.
  (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)
	deleted by us:   docs/reference/edot-collector/config/default-config-standalone.md

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

@theletterf
Copy link
Contributor

Not needed for this branch

@theletterf theletterf closed this Oct 16, 2025
@mergify mergify bot deleted the mergify/bp/8.19/pr-10601 branch October 16, 2025 15:47
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 skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant