search

istio / istio.io

Source for the istio.io site
https://istio.io/
Apache License 2.0
761 stars 1.54k forks source link

Fix publish date for 1.22.5 #15713

Closed dhawton closed 1 month ago

dhawton commented 1 month ago

Description

Typo in year for publishing of 1.22.5

Reviewers

istio-testing commented 1 month ago

In response to a cherrypick label: base branch (release-1.23) needs to differ from target branch (release-1.23)

kfaseela commented 1 month ago

/cherrypick master

istio-testing commented 1 month ago

@kfaseela: #15713 failed to apply on top of branch "master":

Applying: Fix publish date for 1.22.5
Using index info to reconstruct a base tree...
A   content/en/news/releases/1.22.x/announcing-1.22.5/index.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): content/en/news/releases/1.22.x/announcing-1.22.5/index.md deleted in HEAD and modified in Fix publish date for 1.22.5. Version Fix publish date for 1.22.5 of content/en/news/releases/1.22.x/announcing-1.22.5/index.md left in tree.
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 publish date for 1.22.5
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".
In response to [this](https://github.com/istio/istio.io/pull/15713#issuecomment-2364513025): >/cherrypick master Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
istio-testing commented 1 month ago

@kfaseela: new issue created for failed cherrypick: #15715

In response to [this](https://github.com/istio/istio.io/pull/15713#issuecomment-2364513025): >/cherrypick master Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
kfaseela commented 1 month ago

@dhawton was this not needed? Did I unnecessarily mess up the cherrypick? 😀

dhawton commented 1 month ago

I am doing it manually once the 1.21 release notes are also ready and merged