Skip to content

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

Merged
nitin-sachdev-29 merged 2 commits into
release/1.20.xfrom
backport/fix_logging_arch_os/fairly-champion-poodle
Feb 12, 2025
Merged

Backport of fix logging time arch and os into release/1.20.x#22139
nitin-sachdev-29 merged 2 commits into
release/1.20.xfrom
backport/fix_logging_arch_os/fairly-champion-poodle

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
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
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 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
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 merged commit 152c4b7 into release/1.20.x Feb 12, 2025
@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
sarah-oloumi pushed a commit to SolaceDev/consul that referenced this pull request May 29, 2025
…rp#22139)

* backport of commit 4af4c12

* backport of commit 5484f38

---------

Co-authored-by: Dhia Ayachi <dhia.ayachi@gmail.com>
sarah-oloumi pushed a commit to SolaceDev/consul that referenced this pull request Jun 27, 2025
…rp#22139)

* backport of commit 4af4c12

* backport of commit 5484f38

---------

Co-authored-by: Dhia Ayachi <dhia.ayachi@gmail.com>
sarah-oloumi pushed a commit to SolaceDev/consul that referenced this pull request Sep 19, 2025
…rp#22139)

* backport of commit 4af4c12

* backport of commit 5484f38

---------

Co-authored-by: Dhia Ayachi <dhia.ayachi@gmail.com>
sarah-oloumi pushed a commit to SolaceDev/consul that referenced this pull request Sep 23, 2025
…rp#22139)

* backport of commit 4af4c12

* backport of commit 5484f38

---------

Co-authored-by: Dhia Ayachi <dhia.ayachi@gmail.com>
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