Skip to content

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

Merged
roncodingenthusiast merged 3 commits intorelease/1.16.xfrom
backport/fix-missing-oss-change/subtly-unbiased-squirrel
Jun 7, 2023
Merged

Backport of Add writeAuditRPCEvent to agent_oss into release/1.16.x#17608
roncodingenthusiast merged 3 commits intorelease/1.16.xfrom
backport/fix-missing-oss-change/subtly-unbiased-squirrel

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
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

Labels

theme/config Relating to Consul Agent configuration, including reloading

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants