Skip to content

SRVCOM-1334: Add 1.16.0 serverless release notes #33701

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 1 commit into from
Jul 13, 2021
Merged

SRVCOM-1334: Add 1.16.0 serverless release notes #33701

merged 1 commit into from
Jul 13, 2021

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Jun 21, 2021 •
edited
Loading

@abrennan89 abrennan89 added this to the Next Release milestone Jun 21, 2021
@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 21, 2021
@netlify
Copy link

netlify bot commented Jun 21, 2021 •
edited
Loading

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 34e202f

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/60edf1e7e95d93000a07dde8

😎 Browse the preview: https://deploy-preview-33701--osdocs.netlify.app

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 21, 2021
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 24, 2021
nak3
nak3 reviewed Jun 25, 2021
View reviewed changes
@mgencur
Copy link
Contributor

mgencur commented Jul 8, 2021

@abrennan89 can you please include this JIRA in the Known Issues? https://issues.redhat.com/browse/SRVKS-533

@abrennan89 abrennan89 force-pushed the SRVCOM-1334 branch 2 times, most recently from db7cffb to a58752c Compare July 8, 2021 21:08
@mgencur
Copy link
Contributor

mgencur commented Jul 12, 2021

This looks good to me. QE Approved!

@abrennan89 abrennan89 changed the title [WIP] SRVCOM-1334: Add 1.16.0 serverless release notes SRVCOM-1334: Add 1.16.0 serverless release notes Jul 12, 2021
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 12, 2021
kalexand-rh
kalexand-rh reviewed Jul 12, 2021
View reviewed changes
Copy link
Contributor

@kalexand-rh kalexand-rh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a couple of suggestions and questions, but this is looking good!

@kalexand-rh kalexand-rh added the peer-review-done Signifies that the peer review team has reviewed this PR label Jul 12, 2021
@abrennan89 abrennan89 force-pushed the SRVCOM-1334 branch 3 times, most recently from 0899ffa to 40137bc Compare July 13, 2021 20:04
@abrennan89 abrennan89 merged commit 38be03f into openshift:master Jul 13, 2021
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.6

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.7

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link

@abrennan89: #33701 failed to apply on top of branch "enterprise-4.6":

Applying: Add 1.16.0 serverless release notes
Using index info to reconstruct a base tree...
A	_unused_topics/serverless-rn-template-module.adoc
M	modules/serverless-rn-1-10-0.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/serverless-rn-1-10-0.adoc
CONFLICT (content): Merge conflict in modules/serverless-rn-1-10-0.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add 1.16.0 serverless release notes
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:

/cherrypick enterprise-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #34526

In response to this:

/cherrypick enterprise-4.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 13, 2021
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: #33701 failed to apply on top of branch "enterprise-4.8":

Applying: Add 1.16.0 serverless release notes
Using index info to reconstruct a base tree...
A	_unused_topics/serverless-rn-template-module.adoc
A	modules/serverless-rn-1-10-0.adoc
A	modules/serverless-rn-1-11-0.adoc
A	modules/serverless-rn-1-12-0.adoc
A	modules/serverless-rn-1-13-0.adoc
M	serverless/serverless-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging serverless/serverless-release-notes.adoc
CONFLICT (content): Merge conflict in serverless/serverless-release-notes.adoc
CONFLICT (modify/delete): modules/serverless-rn-1-13-0.adoc deleted in HEAD and modified in Add 1.16.0 serverless release notes. Version Add 1.16.0 serverless release notes of modules/serverless-rn-1-13-0.adoc left in tree.
CONFLICT (modify/delete): modules/serverless-rn-1-12-0.adoc deleted in HEAD and modified in Add 1.16.0 serverless release notes. Version Add 1.16.0 serverless release notes of modules/serverless-rn-1-12-0.adoc left in tree.
CONFLICT (modify/delete): modules/serverless-rn-1-11-0.adoc deleted in HEAD and modified in Add 1.16.0 serverless release notes. Version Add 1.16.0 serverless release notes of modules/serverless-rn-1-11-0.adoc left in tree.
CONFLICT (modify/delete): modules/serverless-rn-1-10-0.adoc deleted in HEAD and modified in Add 1.16.0 serverless release notes. Version Add 1.16.0 serverless release notes of modules/serverless-rn-1-10-0.adoc 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 Add 1.16.0 serverless release notes
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:

/cherrypick enterprise-4.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

This was referenced Jul 13, 2021
Merged
Merged
@abrennan89 abrennan89 deleted the SRVCOM-1334 branch December 17, 2021 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kalexand-rh kalexand-rh kalexand-rh left review comments

+1 more reviewer

@nak3 nak3 nak3 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR serverless Label for all Serverless PRs size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

5 participants

@abrennan89 @mgencur @openshift-cherrypick-robot @nak3 @kalexand-rh