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

Backport of fix logging time arch and os into release/1.20.x #22139

Conversation

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

Backport

This PR is auto-generated from #22120 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: "48bfe83a0ea1a5e0d6d03d0f3e229c16711fa30b", automatic backport requires rebase workflow

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


Description

This is needed to fix compiling software dependent on Consul with OS=freebsd and ARCH=386


Overview of commits

Copy link
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 12, 2025
@nitin-sachdev-29 nitin-sachdev-29 marked this pull request as ready for review February 12, 2025 08:06
@nitin-sachdev-29 nitin-sachdev-29 requested a review from a team as a code owner February 12, 2025 08:06
Copy link
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 merged commit 152c4b7 into release/1.20.x Feb 12, 2025
103 checks passed
@nitin-sachdev-29 nitin-sachdev-29 deleted the backport/fix_logging_arch_os/fairly-champion-poodle branch February 12, 2025 08:06
@nitin-sachdev-29 nitin-sachdev-29 restored the backport/fix_logging_arch_os/fairly-champion-poodle branch February 12, 2025 15:28
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.

4 participants