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

[branch/v9] Backport #10665 #11064

Merged
merged 5 commits into from
Mar 16, 2022
Merged

[branch/v9] Backport #10665 #11064

merged 5 commits into from
Mar 16, 2022

Conversation

xacrimon
Copy link
Contributor

Backport of #10665

@github-actions github-actions bot added the audit-log Issues related to Teleports Audit Log label Mar 11, 2022
@zmb3
Copy link
Collaborator

zmb3 commented Mar 11, 2022

I'm not sure why this requires any changes to go.mod - but in any case, don't forget to make update-vendor.

@zmb3
Copy link
Collaborator

zmb3 commented Mar 11, 2022

@xacrimon the title of this PR says [branch/v8] but it looks like the target branch is branch/v9 - which did you intend here?

@xacrimon xacrimon changed the title [branch/v8] Backport #10665 [branch/v9] Backport #10665 Mar 11, 2022
@xacrimon
Copy link
Contributor Author

xacrimon commented Mar 11, 2022

@zmb3 I intended v9, updated. The go.mod changes came up when I ran go mod tidy and are due to the branch being previously out of sync since someone forgot to update before me.

@xacrimon xacrimon enabled auto-merge (squash) March 16, 2022 21:55
@xacrimon xacrimon merged commit 28d4857 into branch/v9 Mar 16, 2022
@xacrimon xacrimon deleted the joel/v9/backport-10665 branch March 16, 2022 22:16
@webvictim webvictim mentioned this pull request Apr 19, 2022
@webvictim webvictim mentioned this pull request Jun 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
audit-log Issues related to Teleports Audit Log
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants