Skip to content

fix quote#3359

Merged
istio-testing merged 1 commit intoistio:masterfrom
craigbox:quotes
Nov 8, 2024
Merged

fix quote#3359
istio-testing merged 1 commit intoistio:masterfrom
craigbox:quotes

Conversation

@craigbox
Copy link
Copy Markdown
Contributor

@craigbox craigbox commented Nov 7, 2024

unbreak lint with fancy quotes => ascii

@craigbox craigbox requested a review from a team as a code owner November 7, 2024 23:49
@istio-policy-bot
Copy link
Copy Markdown

istio-policy-bot commented Nov 7, 2024

🤔 🐛 You appear to be fixing a bug in Go code, yet your PR doesn't include updates to any test files. Did you forget to add a test?

Courtesy of your friendly test nag.

@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 7, 2024
@craigbox craigbox added the release-notes-none Indicates a PR that does not require release notes. label Nov 7, 2024
@craigbox
Copy link
Copy Markdown
Contributor Author

craigbox commented Nov 7, 2024

/test release-notes

@craigbox craigbox added cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch and removed cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch labels Nov 7, 2024
@istio-testing istio-testing merged commit 2cc3366 into istio:master Nov 8, 2024
@craigbox craigbox deleted the quotes branch December 15, 2024 08:55
@craigbox craigbox added the cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch label Dec 15, 2024
@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Dec 15, 2024

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

Applying: fix quote
Using index info to reconstruct a base tree...
M	mesh/v1alpha1/config.pb.go
M	mesh/v1alpha1/config.proto
M	mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
Falling back to patching base and 3-way merge...
Auto-merging mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
CONFLICT (content): Merge conflict in mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
Auto-merging mesh/v1alpha1/config.proto
Auto-merging mesh/v1alpha1/config.pb.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix quote

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Dec 15, 2024

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

@istio-testing istio-testing mentioned this pull request Dec 15, 2024
Closed
craigbox added a commit to craigbox/istio-api that referenced this pull request Dec 15, 2024
@craigbox
manual cherrypick of istio#3359
ee71974
istio-testing pushed a commit that referenced this pull request Dec 16, 2024
@craigbox
manual cherrypick of #3359 (#3391)
5861458 
* manual cherrypick of #3359

* fix lint
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@howardjohn howardjohn howardjohn approved these changes

@keithmattix keithmattix keithmattix approved these changes

Assignees

No one assigned

Labels

cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch release-notes-none Indicates a PR that does not require release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@craigbox @istio-policy-bot @istio-testing @howardjohn @keithmattix