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

[V3] updates from V2 #291

Merged
merged 22 commits into from
Mar 15, 2024
Merged

[V3] updates from V2 #291

merged 22 commits into from
Mar 15, 2024

Conversation

DivergentEuropeans
Copy link
Member

Proposed changes

This PR addresses Issue: [Link to Github issue within https://github.com/zowe/zlux/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

Signed-off-by: 1000TurquoisePogs <[email protected]>
Signed-off-by: 1000TurquoisePogs <[email protected]>
Signed-off-by: 1000TurquoisePogs <[email protected]>
Fix typo (networking -> network)

Signed-off-by: 1000TurquoisePogs <[email protected]>
config for various types of keyrings
Signed-off-by: 1000TurquoisePogs <[email protected]>
Signed-off-by: 1000TurquoisePogs <[email protected]>
Signed-off-by: 1000TurquoisePogs <[email protected]>
Add definition for minTls and maxTls
Signed-off-by: 1000TurquoisePogs <[email protected]>
@struga0258 struga0258 self-requested a review December 21, 2023 15:56
Add schema and default for getting all discovery servers instead of just one
@pull-request-size pull-request-size bot added size/L and removed size/M labels Jan 9, 2024
timgerstel and others added 4 commits January 31, 2024 11:55
Signed-off-by: Timothy Gerstel <[email protected]>
Bump axios 0.22.0 -> 1.6.7
…ll plugins install process instead of the configmgr one even when zowe.useconfigmgr is set, if desired, by setting components.app-server.zowe.useconfigmgr as an override

Signed-off-by: 1000TurquoisePogs <[email protected]>
…n-configmgr

Allow shell plugins init to be run conditional to user preference
@DivergentEuropeans
Copy link
Member Author

V2 seems to really not want to be merged into V3 branch (due to some bug with Git's history) so probably this PR should be merged. (Fixed by merging V3 branch into V2 branch, and then merging that product back into V3)
#298

@DivergentEuropeans DivergentEuropeans merged commit e7db221 into v3.x/staging Mar 15, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

4 participants