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: add agent info reporting log into release/1.15.x #17661

Conversation

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

Backport

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

🚨

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:
@JadhavPoonam
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: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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


Description

Porting the counterpart of ENT PR: https://github.com/hashicorp/consul-enterprise/pull/5559

Testing & Reproduction steps

Screenshot 2023-06-12 at 11 23 33 AM

PR Checklist

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

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix/reporting-log-oss-ent-drift/annually-dominant-seal branch 2 times, most recently from 7a8542b to 75451c1 Compare June 12, 2023 16:08
@hashicorp-cla
Copy link

hashicorp-cla commented Jun 12, 2023

CLA assistant check
All committers have signed the CLA.

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

@JadhavPoonam JadhavPoonam force-pushed the backport/fix/reporting-log-oss-ent-drift/annually-dominant-seal branch from 85b163d to b46ca57 Compare June 12, 2023 18:48
@JadhavPoonam JadhavPoonam marked this pull request as ready for review June 12, 2023 18:48
@JadhavPoonam JadhavPoonam requested review from dhiaayachi and removed request for JadhavPoonam June 12, 2023 18:49
Copy link
Collaborator

@dhiaayachi dhiaayachi left a comment

Choose a reason for hiding this comment

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

🚢

@JadhavPoonam JadhavPoonam enabled auto-merge (squash) June 12, 2023 18:50
@JadhavPoonam JadhavPoonam merged commit 9260674 into release/1.15.x Jun 12, 2023
@JadhavPoonam JadhavPoonam deleted the backport/fix/reporting-log-oss-ent-drift/annually-dominant-seal branch June 12, 2023 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants