api
api copied to clipboard
[release-1.18] Fix typo Authorizaion to Authorization
Manual cherrypick required.
#2909 failed to apply on top of branch "release-1.18":
Applying: Fix typo Authorizaion to Authorization
Using index info to reconstruct a base tree...
M security/v1/authorization_policy.pb.go
Falling back to patching base and 3-way merge...
Auto-merging security/v1/authorization_policy.pb.go
CONFLICT (content): Merge conflict in security/v1/authorization_policy.pb.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix typo Authorizaion to Authorization
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Noting that this will not get picked up in the docs if we do make the change unless we decide to rebuild all the 1.18 docs.