Automated cherry pick of #32593#34228
Conversation
|
We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm. |
Signed-off-by: Johnny Bieren <[email protected]>
Signed-off-by: Johnny Bieren <[email protected]>
|
@johnbieren please confirm that you're ok with that. |
|
The 'parent' PR of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement. (release-note-experimental must be explicit for cherry-picks) |
|
Yes, I am okay with these commits being contributed |
|
@lavalamp I wonder why |
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
|
Automatic merge from submit-queue |
|
Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked. |
Automatic merge from submit-queue hack: update cherry-pick script to show subject when patch is split <!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md 2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md 3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes --> **What this PR does / why we need it**: This is a continuation of #34049, which worked, but then I realized some patch files have more than one subject, see example: #34228 This cleans the output so it looks like this: ``` Automated cherry pick of #32593 Cherry pick of #32593 on release-1.4. #32593: Fix audit_test regex for iso8601 timestamps ``` pretty!!! **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: <!-- Steps to write your release note: 1. Use the release-note-* labels to set the release note state (if you have access) 2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. --> Signed-off-by: Jess Frazelle <[email protected]>
…-of-#32593-upstream-release-1.4 Automatic merge from submit-queue Automated cherry pick of kubernetes#32593 Cherry pick of kubernetes#32593 on release-1.4. kubernetes#32593: Subject: [PATCH 1/2] Fix audit_test regex for iso8601 timestamps Subject: [PATCH 2/2] Fixed edited regex in audit_test unit test
Cherry pick of #32593 on release-1.4.
#32593: Subject: [PATCH 1/2] Fix audit_test regex for iso8601 timestamps
Subject: [PATCH 2/2] Fixed edited regex in audit_test unit test
This change is