Skip to content

Port forward recent version-author-fixes to master - #39679

Merged
phil-davis merged 3 commits into
masterfrom
cherry-pick-recent-version-fixes
Jan 11, 2022
Merged

Port forward recent version-author-fixes to master#39679
phil-davis merged 3 commits into
masterfrom
cherry-pick-recent-version-fixes

Conversation

@JammingBen

Copy link
Copy Markdown
Contributor

Description

This is needed to ensure the app pipelines run with these code changes.

Includes:

@owncloud owncloud deleted a comment from update-docs Bot Jan 11, 2022
@phil-davis

Copy link
Copy Markdown
Contributor

I also cherry-picked the commit from PR #39639 that has the extra acceptance test scenarios related to issue #39662

@phil-davis phil-davis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Note: the changelogs here might cause some things to need resolving if we ever really merge-back release-10.9.1. But if we "merge back" by manually cherry-picking everything we did for 10.9.1 then it won't be a problem - we can sort out the changelog dates... manually.

@sonarqubecloud

Copy link
Copy Markdown
@phil-davis
phil-davis merged commit d581046 into master Jan 11, 2022
@delete-merged-branch
delete-merged-branch Bot deleted the cherry-pick-recent-version-fixes branch January 11, 2022 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants