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

Update protolock #1990

Merged
merged 1 commit into from
May 17, 2021
Merged

Update protolock #1990

merged 1 commit into from
May 17, 2021

Conversation

jacob-delgado
Copy link
Contributor

Path normalization PR #1982 did not have protolock updates.

@google-cla google-cla bot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label May 14, 2021
@istio-testing istio-testing added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 14, 2021
@jacob-delgado jacob-delgado added release-notes-none Indicates a PR that does not require release notes. cherrypick/release-1.10 Set this label on a PR to auto-merge it to the release-1.10 branch labels May 14, 2021
@jacob-delgado
Copy link
Contributor Author

/retest

@istio-testing istio-testing merged commit 1b15945 into istio:master May 17, 2021
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #1990 failed to apply on top of branch "release-1.10":

Applying: make proto-commit
Using index info to reconstruct a base tree...
M	proto.lock
Falling back to patching base and 3-way merge...
Auto-merging proto.lock
CONFLICT (content): Merge conflict in proto.lock
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 make proto-commit
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".

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #1993

@istio-testing istio-testing mentioned this pull request May 17, 2021
Closed
zhlsunshine pushed a commit to zhlistio/api that referenced this pull request Jul 8, 2021
@jacob-delgado
make proto-commit (istio#1990)
b61e017
zhlsunshine pushed a commit to zhlistio/api that referenced this pull request Jul 30, 2021
@jacob-delgado
make proto-commit (istio#1990)
8590568
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@linsun linsun linsun approved these changes

@howardjohn howardjohn howardjohn approved these changes

@dcberg dcberg Awaiting requested review from dcberg

@duderino duderino Awaiting requested review from duderino

@louiscryan louiscryan Awaiting requested review from louiscryan

@nrjpoddar nrjpoddar Awaiting requested review from nrjpoddar

@smawson smawson Awaiting requested review from smawson

Assignees
No one assigned
Labels
cherrypick/release-1.10 Set this label on a PR to auto-merge it to the release-1.10 branch cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. release-notes-none Indicates a PR that does not require release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jacob-delgado @istio-testing @howardjohn @linsun