Closed mergify[bot] closed 2 months ago
Cherry-pick of bd797f2b1d01b7999f0f3557711aef7e4f73c445 has failed:
On branch mergify/bp/release/v0.2.x/pr-102
Your branch is up to date with 'origin/release/v0.2.x'.
You are currently cherry-picking commit bd797f2.
(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: cmd/main.go
modified: config.toml
modified: config/config.go
modified: config/default.go
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by us: templates/client_config.toml
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
Context
new configs under
Telemetry
MetricsEnabled
: manage the metrics on or offMetricsServerPort
: manage the metrics server portReviewers
This is an automatic backport of pull request #102 done by Mergify.