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.10] fix: add back gzip support for grpc otlp endpoint (backport #11434) #11436

Merged
merged 2 commits into from
Aug 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 21, 2023

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

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

You are currently cherry-picking commit cfce80b6.
  (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:   internal/beater/beater.go
	modified:   systemtest/otlp_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.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

@mergify mergify bot requested a review from a team as a code owner August 21, 2023 01:16
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 21, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Aug 21, 2023

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

@kruskall kruskall enabled auto-merge (squash) August 21, 2023 09:38
@lahsivjar lahsivjar disabled auto-merge August 22, 2023 03:51
* fix: add back gzip support for grpc otlp endpoint

* changelog: add changelog entry

(cherry picked from commit cfce80b)

# Conflicts:
#	changelogs/head.asciidoc
@lahsivjar lahsivjar force-pushed the mergify/bp/8.10/pr-11434 branch from aeac126 to ac58bdf Compare August 22, 2023 03:58
@lahsivjar
Copy link
Contributor

Force pushed to sign all commits.

@lahsivjar lahsivjar enabled auto-merge (squash) August 22, 2023 03:58
@lahsivjar lahsivjar merged commit ce7e18f into 8.10 Aug 22, 2023
@lahsivjar lahsivjar deleted the mergify/bp/8.10/pr-11434 branch August 22, 2023 04:13
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.

2 participants