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

fix(telemetry): start telemetry independently from the API server (backport #12448) #12483

Merged
merged 3 commits into from
Jul 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 7, 2022

This is an automatic backport of pull request #12448 done by Mergify.
Cherry-pick of 9057db6 has failed:

On branch mergify/bp/release/v0.46.x/pr-12448
Your branch is up to date with 'origin/release/v0.46.x'.

You are currently cherry-picking commit 9057db6ec.
  (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:   server/api/server.go
	modified:   server/start.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

…2448)

* fix(telemetry): start telemetry independently from the API server

* fix unlock

* add changelog

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit 9057db6)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner July 7, 2022 17:42
@mergify mergify bot added the conflicts label Jul 7, 2022
@julienrbrt julienrbrt added A:automerge Automatically merge PR once all prerequisites pass. and removed conflicts labels Jul 8, 2022
@alexanderbez alexanderbez merged commit c3b2c7c into release/v0.46.x Jul 8, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.46.x/pr-12448 branch July 8, 2022 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants