Skip to content

Fix 1.25 change notes link and format #16295

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
Merged
merged 3 commits into from
Mar 5, 2025
Merged

Fix 1.25 change notes link and format #16295

merged 3 commits into from
Mar 5, 2025
+2 −2

Conversation

wilsonwu
Copy link
Member

@wilsonwu wilsonwu commented Mar 5, 2025

Description

Fix 1.25 change notes link and format

Reviewers

  • Ambient
  • Docs
  • Installation
  • Networking
  • Performance and Scalability
  • Extensions and Telemetry
  • Security
  • Test and Release
  • User Experience
  • Developer Infrastructure
  • Localization/Translation

@wilsonwu wilsonwu requested a review from a team as a code owner March 5, 2025 09:41
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 5, 2025
@wilsonwu
Copy link
Member Author

wilsonwu commented Mar 5, 2025

@craigbox the dns auto allocation v2 content only in 1.24 doc, how to use the link without lint problem?

@dhawton
Copy link
Member

dhawton commented Mar 5, 2025

@craigbox the dns auto allocation v2 content only in 1.24 doc, how to use the link without lint problem?

It was fixed in another PR

@craigbox craigbox dismissed dhawton’s stale review March 5, 2025 23:04

manually fixed in merge PR

@craigbox craigbox added the cherrypick/release-1.25 Set this label on a PR to auto-merge it to the release-1.25 branch label Mar 5, 2025
@istio-testing istio-testing merged commit 03f2b8b into istio:master Mar 5, 2025
6 checks passed
@istio-testing
Copy link
Contributor

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

Applying: fix 1.25 change notes link and format
Using index info to reconstruct a base tree...
M	content/en/news/releases/1.25.x/announcing-1.25/change-notes/index.md
Falling back to patching base and 3-way merge...
Auto-merging content/en/news/releases/1.25.x/announcing-1.25/change-notes/index.md
CONFLICT (content): Merge conflict in content/en/news/releases/1.25.x/announcing-1.25/change-notes/index.md
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 1.25 change notes link and format

@istio-testing
Copy link
Contributor

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

@istio-testing istio-testing mentioned this pull request Mar 5, 2025
Closed
istio-testing pushed a commit that referenced this pull request Mar 10, 2025
@craigbox
manual CP of #16295 (#16311)
36e31c9 
* manual CP

* Empty commit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@craigbox craigbox craigbox approved these changes

@dhawton dhawton dhawton left review comments

Assignees
No one assigned
Labels
cherrypick/release-1.25 Set this label on a PR to auto-merge it to the release-1.25 branch kind/docs 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
@wilsonwu @dhawton @istio-testing @craigbox @istio-policy-bot