Skip to content
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

Merge v1.11.0-beta.1 release into dev. #1655

Merged
merged 16 commits into from
Aug 16, 2024
Merged

Merge v1.11.0-beta.1 release into dev. #1655

merged 16 commits into from
Aug 16, 2024

Conversation

fernandofloresg
Copy link
Collaborator

SUMMARY

As part of the release process we need to merge back the release branch into the dev branch.

ISSUE TYPE
  • Release Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION

@fernandofloresg fernandofloresg marked this pull request as ready for review August 12, 2024 21:13
richp405
richp405 requested changes Aug 13, 2024
View reviewed changes
Copy link
Collaborator

@richp405 richp405 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Everything looks great, except for test_zos_mvs_raw_func.py
It looks like the merge went bad, because there were many > 20 duplicate lines. I marked most of them, then realized I didn't want to swamp you.
Looks like same issue in test...copy_func

tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
tests/functional/modules/test_zos_mvs_raw_func.py Outdated Show resolved Hide resolved
ddimatos
ddimatos requested changes Aug 14, 2024
View reviewed changes
Copy link
Collaborator

@ddimatos ddimatos left a comment

Choose a reason for hiding this comment

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

Thanks @fernandofloresg - left you a few things to review.

docs/source/resources/releases_maintenance.rst Outdated Show resolved Hide resolved
plugins/modules/zos_blockinfile.py Outdated Show resolved Hide resolved
plugins/modules/zos_lineinfile.py Outdated Show resolved Hide resolved
plugins/modules/zos_unarchive.py Outdated Show resolved Hide resolved
plugins/modules/zos_unarchive.py Outdated Show resolved Hide resolved
plugins/modules/zos_unarchive.py Outdated Show resolved Hide resolved
richp405
richp405 requested changes Aug 14, 2024
View reviewed changes
Copy link
Collaborator

@richp405 richp405 left a comment

Choose a reason for hiding this comment

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

one document had duplicate lines (same merge problem I saw in other files yesterday). I left a few comments... it seems like it is only 1 file now.

docs/source/modules/zos_backup_restore.rst Outdated Show resolved Hide resolved
docs/source/modules/zos_backup_restore.rst Outdated Show resolved Hide resolved
docs/source/modules/zos_backup_restore.rst Outdated Show resolved Hide resolved
docs/source/modules/zos_backup_restore.rst Outdated Show resolved Hide resolved
@rexemin rexemin self-requested a review August 15, 2024 16:02
rexemin
rexemin approved these changes Aug 15, 2024
View reviewed changes
Copy link
Collaborator

@rexemin rexemin left a comment

Choose a reason for hiding this comment

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

Thanks for working so much on this, I imagine this must have been so confusing with the merge issues. You resolved my comments and I think it's good now

ddimatos
ddimatos approved these changes Aug 15, 2024
View reviewed changes
Copy link
Collaborator

@ddimatos ddimatos left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks for working on the edits. Nice work @fernandofloresg

richp405
richp405 approved these changes Aug 16, 2024
View reviewed changes
Copy link
Collaborator

@richp405 richp405 left a comment

Choose a reason for hiding this comment

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

Thanks... that was a BOATLOAD of changes... looks much better now.

@fernandofloresg fernandofloresg merged commit d22ea12 into dev Aug 16, 2024
5 checks passed
@fernandofloresg fernandofloresg deleted the cherry-picked-1110-beta-into-dev branch August 16, 2024 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rexemin rexemin rexemin approved these changes

@ddimatos ddimatos ddimatos approved these changes

@richp405 richp405 richp405 approved these changes

@ketankelkar ketankelkar Awaiting requested review from ketankelkar

@AndreMarcel99 AndreMarcel99 Awaiting requested review from AndreMarcel99

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fernandofloresg @rexemin @ddimatos @richp405