Skip to content

Backport of logging fix for netbsd os into release/1.20.x#22191

Merged
nitin-sachdev-29 merged 3 commits into
release/1.20.xfrom
backport/nitin/loggin-fix-for-netbsd/namely-curious-bullfrog
Feb 27, 2025
Merged

Backport of logging fix for netbsd os into release/1.20.x#22191
nitin-sachdev-29 merged 3 commits into
release/1.20.xfrom
backport/nitin/loggin-fix-for-netbsd/namely-curious-bullfrog

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #22184 to be assessed for backporting due to the inclusion of the label backport/1.20.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@nitin-sachdev-29
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "dadf4e1eb2b00b64a9a551b1d958adabc1e4ea4b", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

compilation error fix for NetBSD OS

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@github-actions github-actions Bot added the theme/telemetry Anything related to telemetry or observability label Feb 27, 2025
@nitin-sachdev-29 nitin-sachdev-29 marked this pull request as ready for review February 27, 2025 08:32
@nitin-sachdev-29 nitin-sachdev-29 requested a review from a team as a code owner February 27, 2025 08:32
Copy link
Copy Markdown
Contributor

@nitin-sachdev-29 nitin-sachdev-29 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nitin-sachdev-29 nitin-sachdev-29 enabled auto-merge (squash) February 27, 2025 08:34
@nitin-sachdev-29 nitin-sachdev-29 merged commit fa9e903 into release/1.20.x Feb 27, 2025
@nitin-sachdev-29 nitin-sachdev-29 deleted the backport/nitin/loggin-fix-for-netbsd/namely-curious-bullfrog branch February 27, 2025 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

theme/telemetry Anything related to telemetry or observability

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants