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.

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

Merge staging into rc #398

Merged
merged 30 commits into from
Aug 29, 2023
Merged

Merge staging into rc #398

merged 30 commits into from
Aug 29, 2023

Conversation

struga0258
Copy link
Contributor

Proposed changes

This PR addresses Issue: [Link to Github issue within https://github.com/zowe/zowe-common-c/issues if any]

This PR depends upon the following PRs:

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Change in a documentation
  • Refactor the code
  • Chore, repository cleanup, updates the dependencies.
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

PR Checklist

Please delete options that are not relevant.

  • If the changes in this PR are meant for the next release / mainline, this PR targets the "staging" branch.
  • My code follows the style guidelines of this project (see: Contributing guideline)
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • New and existing unit tests pass locally with my changes
  • video or image is included if visual changes are made
  • Relevant update to CHANGELOG.md
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works, or describe a test method below

Testing

Further comments

jordanfilteau1995 and others added 30 commits April 5, 2023 11:25
Signed-off-by: Jordan Filteau <[email protected]>
Signed-off-by: Jordan Filteau <[email protected]>
Signed-off-by: Jordan Filteau <[email protected]>
Signed-off-by: James Struga <[email protected]>
Signed-off-by: James Struga <[email protected]>
…feDisableZosVersionCheck

Signed-off-by: 1000TurquoisePogs <[email protected]>
Allow bypassing zos version check with env var ZWE_zowe_launcher_unsafeDisableZosVersionCheck
Fixed an inconsistent use of pointers in 64 bit case in dataset creation
Signed-off-by: struga0258 <[email protected]>
Signed-off-by: Leanid Astrakou <[email protected]>
…ls.c; simplying logic for loop in tls.c

Signed-off-by: Jordan Filteau <[email protected]>
Client Certificate Authentication with R_usermap
Signed-off-by: Jordan Filteau <[email protected]>
Signed-off-by: Leanid Astrakou <[email protected]>
Fix introduced compiler warning from recent merge.
Signed-off-by: Leanid Astrakou <[email protected]>
Move WTO code from metal.c to zos.c + add shim
@1000TurquoisePogs 1000TurquoisePogs merged commit 12a2d8e into v2.x/rc Aug 29, 2023
9 checks passed
@1000TurquoisePogs
Copy link
Member

DCO bot still hung, force merged as a result

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants