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

Backport of Add writeAuditRPCEvent to agent_oss into release/1.16.x #17608

Merged
merged 3 commits into from
Jun 7, 2023
Merged

Backport of Add writeAuditRPCEvent to agent_oss into release/1.16.x #17608

merged 3 commits into from
Jun 7, 2023

Conversation

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

Backport

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

🚨

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:
@roncodingenthusiast
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: "22e2c0496acfd8be14c3140c0a6accdc4a34dc12", automatic backport requires rebase workflow

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

Description

Add missing function to agent_oss.

  • add any missing diff from enterprise
Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix-missing-oss-change/subtly-unbiased-squirrel branch from b2c9a52 to d6a3688 Compare June 7, 2023 22:36
@github-actions github-actions bot added the theme/config Relating to Consul Agent configuration, including reloading label Jun 7, 2023
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Jun 7, 2023
View reviewed changes
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

@roncodingenthusiast roncodingenthusiast marked this pull request as ready for review June 7, 2023 23:00
@roncodingenthusiast roncodingenthusiast merged commit 41b4597 into release/1.16.x Jun 7, 2023
@roncodingenthusiast roncodingenthusiast deleted the backport/fix-missing-oss-change/subtly-unbiased-squirrel branch June 7, 2023 23:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roncodingenthusiast roncodingenthusiast roncodingenthusiast approved these changes

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

Assignees

@roncodingenthusiast roncodingenthusiast

Labels
theme/config Relating to Consul Agent configuration, including reloading
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-consul-core @roncodingenthusiast @github-team-consul-core-pr-approver