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.

Sign up for GitHub

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

Jump to bottom

fix logging time arch and os #22120

Merged
merged 5 commits into from
Feb 12, 2025
Merged

fix logging time arch and os #22120

merged 5 commits into from
Feb 12, 2025
+24 −2

Conversation

dhiaayachi
Copy link
Collaborator

Description

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

@dhiaayachi dhiaayachi requested a review from a team as a code owner February 5, 2025 18:38
@dhiaayachi dhiaayachi added the backport/all Apply backports for all active releases per .release/versions.hcl label Feb 5, 2025
@github-actions github-actions bot added the theme/telemetry Anything related to telemetry or observability label Feb 5, 2025
nitin-sachdev-29
nitin-sachdev-29 previously approved these changes Feb 12, 2025
View reviewed changes
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

abhishek-hashicorp
abhishek-hashicorp requested changes Feb 12, 2025
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
abhishek-hashicorp
abhishek-hashicorp approved these changes Feb 12, 2025
View reviewed changes
Copy link
Contributor

@abhishek-hashicorp abhishek-hashicorp 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 12, 2025 07:52
@nitin-sachdev-29 nitin-sachdev-29 merged commit 93e9bfa into main Feb 12, 2025
94 checks passed
@nitin-sachdev-29 nitin-sachdev-29 deleted the fix_logging_arch_os branch February 12, 2025 07:52
@hc-github-team-consul-core hc-github-team-consul-core added backport/1.20 Changes are backported to 1.20 backport/ent/1.15 Changes are backported to 1.15 ent backport/ent/1.18 Changes are backported to 1.18 ent backport/ent/1.19 Changes are backported to 1.19 ent labels Feb 12, 2025
@hc-github-team-consul-core hc-github-team-consul-core mentioned this pull request Feb 12, 2025
Merged
@hc-github-team-consul-core
Copy link
Collaborator

📣 Hi @dhiaayachi! a backport is missing for this PR [22120] for versions [1.15,1.18,1.19] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@abhishek-hashicorp abhishek-hashicorp removed the backport/ent/1.15 Changes are backported to 1.15 ent label Feb 12, 2025
@hc-github-team-consul-core
Copy link
Collaborator

📣 Hi @dhiaayachi! a backport is missing for this PR [22120] for versions [1.18,1.19] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@nitin-sachdev-29 nitin-sachdev-29 added backport/ent/1.18 Changes are backported to 1.18 ent backport/ent/1.19 Changes are backported to 1.19 ent and removed backport/ent/1.18 Changes are backported to 1.18 ent backport/ent/1.19 Changes are backported to 1.19 ent labels Feb 12, 2025
@nitin-sachdev-29 nitin-sachdev-29 added the backport/ent/1.19 Changes are backported to 1.19 ent label Feb 12, 2025
This was referenced Feb 12, 2025
Closed
Closed
@nitin-sachdev-29 nitin-sachdev-29 removed backport/ent/1.18 Changes are backported to 1.18 ent backport/ent/1.19 Changes are backported to 1.19 ent labels Feb 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nitin-sachdev-29 nitin-sachdev-29 nitin-sachdev-29 left review comments

@abhishek-hashicorp abhishek-hashicorp abhishek-hashicorp approved these changes

Assignees
No one assigned
Labels
backport/all Apply backports for all active releases per .release/versions.hcl backport/1.20 Changes are backported to 1.20 theme/telemetry Anything related to telemetry or observability
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dhiaayachi @hc-github-team-consul-core @abhishek-hashicorp @nitin-sachdev-29