Skip to content

[v13] Define and add IneligibleStatus fields for access list members and owners (#31857)#32279

Merged
kimlisa merged 3 commits intobranch/v13from
lisa/v13/ineligible-reason
Sep 21, 2023
Merged

[v13] Define and add IneligibleStatus fields for access list members and owners (#31857)#32279
kimlisa merged 3 commits intobranch/v13from
lisa/v13/ineligible-reason

Conversation

@kimlisa
Copy link
Copy Markdown
Contributor

@kimlisa kimlisa commented Sep 21, 2023

backport (#31857) to branch/v13

manual backport because of a conflict with how we return error.

in master we return trace.Wrap(err) from conv.FromProto, but in v13 we return trail.FromGRPC(err) (i went with trace.Wrap(err) b/c conv.FromProto returns trace errors)

also adds a fix where i didn't check error before running options: 50ee88c

@github-actions github-actions Bot requested review from jakule and mdwn September 21, 2023 03:14
@kimlisa kimlisa changed the title Define and add IneligibleStatus fields for access list members and owners (#31857) [v13] Define and add IneligibleStatus fields for access list members and owners (#31857) Sep 21, 2023
@kimlisa kimlisa enabled auto-merge September 21, 2023 19:58
@kimlisa kimlisa added this pull request to the merge queue Sep 21, 2023
Merged via the queue into branch/v13 with commit 9aa038c Sep 21, 2023
@kimlisa kimlisa deleted the lisa/v13/ineligible-reason branch September 21, 2023 20:30
@fheinecke fheinecke mentioned this pull request Sep 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants