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 v2.x/rc to resolve a conflict #639

Merged
merged 27 commits into from
Aug 30, 2023
+0 −0
Merged

Merge v2.x/rc to resolve a conflict #639

Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0e988df
Zowe Suite v2.0.0
zowe-robot Apr 13, 2022
316e75a
Zowe Suite v2.0.0
zowe-robot Apr 14, 2022
2a06b9b
Merge pull request #454 from zowe/v2.x/staging
1000TurquoisePogs Apr 21, 2022
1e276cb
Zowe Suite v2.1.0
zowe-robot Jun 1, 2022
160b6d1
Zowe Suite ${release-version}
zowe-robot Jul 13, 2022
2fb7039
Zowe Suite v1.28.1
zowe-robot Aug 16, 2022
adc0b09
Zowe Suite v2.3.0
zowe-robot Sep 1, 2022
869005d
Merge pull request #511 from zowe/v2.x/staging
1000TurquoisePogs Sep 12, 2022
f936563
Zowe Suite v2.4.0
zowe-robot Oct 4, 2022
ad9627a
Merge pull request #521 from zowe/v2.x/staging
1000TurquoisePogs Oct 5, 2022
506e8a2
Zowe Suite v2.5.0-RC1
zowe-robot Nov 30, 2022
40328cb
Zowe Suite v2.6.0-RC1
zowe-robot Jan 10, 2023
6e8b598
Update staging pointer
1000TurquoisePogs Jan 10, 2023
30545b0
Merge pull request #549 from zowe/v2/update-rc
1000TurquoisePogs Jan 10, 2023
42a7c40
merge staging into rc
Mar 2, 2023
1344b34
update deps
Mar 2, 2023
3eeccba
Merge pull request #568 from zowe/user/jstruga/merge-staging-rc
1000TurquoisePogs Mar 3, 2023
104cb7f
Merge pull request #573 from zowe/v2.x/staging
1000TurquoisePogs Mar 13, 2023
86c915e
Zowe Suite v2.8.0
zowe-robot Apr 13, 2023
9ad5d10
Zowe Suite v2.8.0
zowe-robot Apr 13, 2023
05502a6
Zowe Suite v2.9.0
zowe-robot May 31, 2023
7910e6c
Zowe Suite v2.9.0
zowe-robot May 31, 2023
6099387
Update deps pointer
Jun 8, 2023
603dc80
Merge pull request #610 from zowe/users/jstruga/update-pointer-rc
1000TurquoisePogs Jun 8, 2023
20f09bd
Merge branch 'v2.x/staging' into v2.x/rc
1000TurquoisePogs Jul 11, 2023
f699c1c
Updating RC pointer due to automation having conflict
1000TurquoisePogs Jul 12, 2023
e43d83e
Merge remote-tracking branch 'origin/v2.x/rc' into v2.x/staging
ifakhrutdinov Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.