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

Update v3 staging #723

Merged
merged 40 commits into from
Aug 9, 2024
Merged

Update v3 staging #723

merged 40 commits into from
Aug 9, 2024

Conversation

struga0258
Copy link
Contributor

Proposed changes

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

ifakhrutdinov and others added 30 commits October 18, 2023 11:26
@ifakhrutdinov
Remove unnecessary AC=1 options from build scripts and comments
a1de800 
Additionally, remove the old ZIS build script.

Signed-off-by: Irek Fakhrutdinov <ifakhrutdinov@rocketsoftware.com>
@1000TurquoisePogs
Fix for detecting whether or not in HA mode, and what HA cookie value…
a66bb79 
… should be

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
@1000TurquoisePogs
Merge branch 'v2.x/staging' of github.com:zowe/zss into bugfix/v2/coo…
d0e0167 
…kie-ha-name
@1000TurquoisePogs
Update changelog
3f210cc 
Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
@DivergentEuropeans
Merge branch 'v2.x/staging' into bugfix/v2/cookie-ha-name
1bdf0b4
@JoeNemo
Merge pull request #675 from zowe/bugfix/v2/cookie-ha-name
5980edf 
Fix cookie name setup
v2.15.0
7500dd4 
Signed-off-by: struga0258 <dummy-email@email.com>
@ifakhrutdinov
Update zowe-common-c deps
5e8de85 
Signed-off-by: Irek Fakhrutdinov <ifakhrutdinov@rocketsoftware.com>
@1000TurquoisePogs
Merge pull request #686 from zowe/feature/update-deps
f7b1e7e 
Update zowe-common-c deps
@ifakhrutdinov
Merge branch 'v2.x/staging' into bugfix/unnecessary-ac1
811a677
@ifakhrutdinov
Merge pull request #658 from zowe/bugfix/unnecessary-ac1
b20a542 
Remove unnecessary AC=1 options from build scripts and comments
@ifakhrutdinov
Take into account leap seconds in AUX messages' timestamps; update deps
8a8fd50 
Fixes: #690

Signed-off-by: Irek Fakhrutdinov <ifakhrutdinov@rocketsoftware.com>
@JoeNemo
Merge pull request #691 from zowe/bugfix/leap-seconds-in-zis-aux-msg
b16b8d0 
Take into account leap seconds in AUX messages' timestamps
@jordanfilteau1995
updating pointer for zowe-common-c.
4a11baf 
Signed-off-by: Jordan Filteau <jfilteau@rocketsoftware.com>
@JoeNemo
Merge pull request #694 from zowe/jordan-dev
a00e16c 
updating pointer for zowe-common-c.
v2.16.0
180114f 
Signed-off-by: struga0258 <dummy-email@email.com>
@kirkster96
Fix Typo in README.md
6e89d7f 
Signed-off-by: Cameron Kirk <kirkster96@gmail.com>
@ifakhrutdinov
Update the zowe-common-c dependency
1570b68 
Signed-off-by: Irek Fakhrutdinov <ifakhrutdinov@rocketsoftware.com>
@1000TurquoisePogs
Set native tls off if attls is on
b1840bf 
Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
@ifakhrutdinov
Merge pull request #708 from zowe/feature/update-deps
57d8d0f 
Update the zowe-common-c dependency
@Gautham-coder
Correcting the zowe-common-c
28903b1 
Signed-off-by: Gautham Kuppuswamy <gkuppuswamy@rocketsoftware.com>
@Gautham-coder
Changelog and missing code in zss.c module
22af74e 
Signed-off-by: Gautham Kuppuswamy <gkuppuswamy@rocketsoftware.com>
@Gautham-coder
Merge branch 'httpserver-heap-config' of github.com:zowe/zss into htt…
1d658cb 
…pserver-heap-config
@JoeNemo
Merge branch 'v2.x/staging' into feature/v2/attls
c337ed3
@JoeNemo
Merge pull request #701 from zowe/httpserver-heap-config
438a365 
configure SLH size for ZSS to handle file size greater than 6mb
@1000TurquoisePogs
Merge branch 'v2.x/staging' into patch-2
99c428e
@1000TurquoisePogs
Merge pull request #706 from kirkster96/patch-2
140b64f 
Fix Typo in README.md
@1000TurquoisePogs
Merge branch 'v2.x/staging' into feature/v2/attls
d218632
@1000TurquoisePogs
Merge pull request #710 from zowe/feature/v2/attls
f44ce8a 
Set native tls off if attls is on
@1000TurquoisePogs
Apply HEAPPOOLS64(OFF) to plugins-init
4ef981f 
Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
struga0258 and others added 10 commits July 1, 2024 14:11
v2.17.0
1859f0b 
Signed-off-by: struga0258 <dummy-email@email.com>
@1000TurquoisePogs
Merge branch 'v2.x/staging' into bugfix/v2/heappools64
9868d8e
@1000TurquoisePogs
Merge pull request #715 from zowe/bugfix/v2/heappools64
b1e08d7 
Apply HEAPPOOLS64(OFF) to plugins-init
@Gautham-coder
Change log level for setting default value of 'httpRequestHeapMaxBloc…
486e64c 
…ks' to DEFAULT instead of INFO

Signed-off-by: Gautham Kuppuswamy <gkuppuswamy@rocketsoftware.com>
@Gautham-coder
Update the CHANGELOG with correct PR number
7823e03 
Signed-off-by: Gautham Kuppuswamy <gkuppuswamy@rocketsoftware.com>
@Gautham-coder
Correcting typo for CHANGELOG wrt PR #719
8db4aba 
Signed-off-by: Gautham Kuppuswamy <gkuppuswamy@rocketsoftware.com>
v2.18.0
05fc40f 
Signed-off-by: struga0258 <dummy-email@email.com>
@1000TurquoisePogs
Merge branch 'v2.x/staging' into change-log-to-debug
0490f8b
@1000TurquoisePogs
Merge pull request #719 from zowe/change-log-to-debug
6a4a315 
Change log level for setting default value of 'httpRequestHeapMaxBlocks' to DEFAULT instead of INFO
fix merge conflict
c067830 
Signed-off-by: James Struga <jstruga@rocketsoftware.com>
@1000TurquoisePogs 1000TurquoisePogs merged commit a972451 into v3.x/staging Aug 9, 2024
5 checks passed
@struga0258 struga0258 deleted the users/jstruga/updatev3 branch January 8, 2025 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1000TurquoisePogs 1000TurquoisePogs 1000TurquoisePogs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
zOS Squad Board
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@struga0258 @1000TurquoisePogs @ifakhrutdinov @DivergentEuropeans @JoeNemo @jordanfilteau1995 @kirkster96 @Gautham-coder