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

Backport v1.x master to staging #3860

Merged
merged 65 commits into from
Jun 13, 2024
Merged

Backport v1.x master to staging #3860

merged 65 commits into from
Jun 13, 2024

Commits on Mar 28, 2024

  1. WebUI v1.28.6 RC1 

    Signed-off-by: James Struga <[email protected]>
    James Struga committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    97126ea View commit details
    Browse the repository at this point in the history

  2. Update zss 

    Signed-off-by: James Struga <[email protected]>
    James Struga committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    443d94f View commit details
    Browse the repository at this point in the history

  3. apiml 1.28.6 rc1 

    Signed-off-by: achmelo <[email protected]>
    @achmelo
    achmelo committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    ea14795 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3782 from zowe/user/markackert/v1-staging-to-rc 

    User/markackert/v1 staging to rc
    @MarkAckert
    MarkAckert authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e883d42 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v1.x/rc' into reboot/apiml_1-28-6-rc1 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    5763f55 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'v1.x/rc' into users/jstruga/v1.28.6-RC1 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    127b063 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #3780 from zowe/reboot/apiml_1-28-6-rc1 

    apiml 1.28.6 rc1
    @MarkAckert
    MarkAckert authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    a935424 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'v1.x/rc' into users/jstruga/v1.28.6-RC1

    @MarkAckert
    MarkAckert authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    9ecf4a6 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #3778 from zowe/users/jstruga/v1.28.6-RC1 

    WebUI v1.28.6 RC1
    @MarkAckert
    MarkAckert authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    54f90ea View commit details
    Browse the repository at this point in the history

  10. Update component versions 

    Signed-off-by: zowe-robot <[email protected]>
    @zowe-robot
    zowe-robot committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    c2d61b3 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3783 from zowe/v1.28.6/cli/rc 

    Update CLI component versions for 1.28.6
    @MarkAckert
    MarkAckert authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    628970f View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. lock in files, jobs, datasets explorer artifacts 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    bb10934 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3786 from zowe/user/markackert/explorer-updates 

    Update explorer artifacts
    @MarkAckert
    MarkAckert authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    67761de View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. update manifest.json.template file for v1.28.6 

    Signed-off-by: ManjuVNair133 <[email protected]>
    @ManjuVNair133
    ManjuVNair133 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    cb87f83 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. update imageDependencies zowe-launch-scripts 

    Signed-off-by: ojcelis <[email protected]>
    @ojcelis
    ojcelis committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    6adac38 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Merge pull request #3791 from zowe/manifestimagesfor1.28.6 

    update manifest.json.template file for v1.28.6
    @MarkAckert
    MarkAckert authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    7b649dc View commit details
    Browse the repository at this point in the history

  2. update licenses package 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3fa6a30 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3793 from zowe/user/markackert/1.28.6-rc-to-master 

    Prepare for 1.28.6 release
    @MarkAckert
    MarkAckert authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    1043670 View commit details
    Browse the repository at this point in the history

  4. remove imperative (now in zowe-cli) 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    ed57832 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v1.x/master' into user/markackert/1.28.6-rc-to-master

    @MarkAckert
    MarkAckert authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    f7835d0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3794 from zowe/user/markackert/1.28.6-rc-to-master 

    remove imperative (now in zowe-cli)
    @MarkAckert
    MarkAckert authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2a145d1 View commit details
    Browse the repository at this point in the history

  7. update cics cli repo 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    6e2aa28 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3795 from zowe/user/markackert/update-sourceDeps-v1 

    update cics cli repo
    @MarkAckert
    MarkAckert authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    802ab3e View commit details
    Browse the repository at this point in the history

  9. fix remaining versions 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    c9e85d9 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #3796 from zowe/user/markackert/v1x-final-version-… 

    …fixes

fix remaining versions
    @MarkAckert
    MarkAckert authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    7261c49 View commit details
    Browse the repository at this point in the history

  11. fix zowe vscode repo name 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    d8da66c View commit details
    Browse the repository at this point in the history

  12. Merge pull request #3797 from zowe/user/markackert/fix-vscode-sourced… 

    …eps-repo

fix zowe vscode repo name
    @MarkAckert
    MarkAckert authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4e4e03b View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Update component versions 

    Signed-off-by: zowe-robot <[email protected]>
    @zowe-robot
    zowe-robot committed May 24, 2024
    Configuration menu
    Copy the full SHA
    c182af8 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. API ML 1.28.7 rc1 

    Signed-off-by: achmelo <[email protected]>
    @achmelo
    achmelo committed May 29, 2024
    Configuration menu
    Copy the full SHA
    311b525 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. API ML 1.28.7 rc1 

    Signed-off-by: achmelo <[email protected]>
    @achmelo
    achmelo committed May 30, 2024
    Configuration menu
    Copy the full SHA
    521c376 View commit details
    Browse the repository at this point in the history

  2. datasets and jobs 1.28.7 rc1 

    Signed-off-by: achmelo <[email protected]>
    @achmelo
    achmelo committed May 30, 2024
    Configuration menu
    Copy the full SHA
    09fd488 View commit details
    Browse the repository at this point in the history

  3. Revert "API ML 1.28.7 rc1" 

    This reverts commit 311b525.

Signed-off-by: achmelo <[email protected]>
    @achmelo
    achmelo committed May 30, 2024
    Configuration menu
    Copy the full SHA
    5d617a5 View commit details
    Browse the repository at this point in the history

  4. add manifest 

    Signed-off-by: James Struga <[email protected]>
    James Struga committed May 30, 2024
    Configuration menu
    Copy the full SHA
    059dc02 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v1.x/staging' into user/markackert/v1-staging-to-rc 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed May 30, 2024
    Configuration menu
    Copy the full SHA
    aa34b39 View commit details
    Browse the repository at this point in the history

  6. update licenses 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a126ef4 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #3842 from zowe/user/markackert/v1-staging-to-rc 

    v1.28.7 staging to rx
    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    3c8d97f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'v1.x/rc' into reboot/apiml_v1_rc1

    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    d7c3f00 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'v1.x/rc' into reboot/jobs-updt

    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    83ea641 View commit details
    Browse the repository at this point in the history

  10. update sourceDeps 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed May 30, 2024
    Configuration menu
    Copy the full SHA
    170a457 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3839 from zowe/reboot/apiml_v1_rc1 

    API ML 1.28.7 rc1
    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    addc0d9 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'v1.x/rc' into reboot/jobs-updt

    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    80c75ca View commit details
    Browse the repository at this point in the history

  13. Merge branch 'v1.x/rc' into v1.28.7/cli/rc

    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    a315a3c View commit details
    Browse the repository at this point in the history

  14. Merge pull request #3840 from zowe/reboot/jobs-updt 

    jobs and datasets 1.28.7 rv1
    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    e37dddf View commit details
    Browse the repository at this point in the history

  15. Merge branch 'v1.x/rc' into v1.28.7/cli/rc

    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    13835d1 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #3837 from zowe/v1.28.7/cli/rc 

    Update CLI component versions for 1.28.7
    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    fe96b55 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'v1.x/rc' into useers/jstruga/webui-rc1

    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    c8b80c9 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #3841 from zowe/useers/jstruga/webui-rc1 

    WebUI 1.28.7 RC1
    @MarkAckert
    MarkAckert authored May 30, 2024
    Configuration menu
    Copy the full SHA
    0bc15c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. skip fmid config step for ptf tests 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    6a5ba95 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3846 from zowe/user/markackert/ptf-build-fixes-v1 

    Fix PTF Test Errors in v1.x
    @MarkAckert
    MarkAckert authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    8ed7297 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. address build failure 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    0184e37 View commit details
    Browse the repository at this point in the history

  2. debug content 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2c324e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. move certificate setup post-ptf 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    cb4bf43 View commit details
    Browse the repository at this point in the history

  2. move to configptf 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    5dfa917 View commit details
    Browse the repository at this point in the history

  3. small fixes 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0709296 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. try skipping old configfmid 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    83a8ca8 View commit details
    Browse the repository at this point in the history

  2. remove validate_configuration check 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    5cf6328 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Merge branch 'v1.x/rc' into user/markackert/ptf-build-fixes-v1

    @MarkAckert
    MarkAckert authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    9081114 View commit details
    Browse the repository at this point in the history

  2. remove debug, add more conversions 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    52fe1f7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3849 from zowe/user/markackert/ptf-build-fixes-v1 

    PTF Build Failure (part 2)
    @MarkAckert
    MarkAckert authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    4df918a View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. merge v1.x/rc in to v1.x/master 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    7cfcbdd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3855 from zowe/user/markackert/rc-to-master-1.28.7 

    1.28.7 rc to master
    @MarkAckert
    MarkAckert authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    b9e15cd View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Merge branch 'v1.x/master' into user/markackert/backport-v1x-master-t… 

    …o-staging

Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    3c1d736 View commit details
    Browse the repository at this point in the history

  2. update zowe version for staging 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    e97ba12 View commit details
    Browse the repository at this point in the history

  3. fix manifest for staging 

    Signed-off-by: MarkAckert <[email protected]>
    @MarkAckert
    MarkAckert committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    e7d674e View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Merge branch 'v1.x/staging' into user/markackert/backport-v1x-master-… 

    …to-staging
    @MarkAckert
    MarkAckert authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7c7e707 View commit details
    Browse the repository at this point in the history