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

Upgrade/salt3006.3 #11612

Merged
merged 26 commits into from
Oct 24, 2023
Merged

Upgrade/salt3006.3 #11612

merged 26 commits into from
Oct 24, 2023

Conversation

m0duspwnens
Copy link
Contributor

@m0duspwnens
upgrade to salt 3006.3
2094b4f
@m0duspwnens
fix upgrade_salt function for oel
d357864
@m0duspwnens
update bootstrap-salt.sh with stable branch
ab4c5ac
@m0duspwnens
use script from develop branch
8dc163f
@m0duspwnens
change install_centos_onedir to install version provided from command…
6dd06c0 
… line
@m0duspwnens
remove files
b12c4a9
@m0duspwnens
handle version install for stable and onedir install type
2d68833
@m0duspwnens
only allow stable install type. require -r to be used
5250292
@m0duspwnens
add additional comments
d2002a5
@m0duspwnens
Merge remote-tracking branch 'origin/2.4/dev' into upgrade/salt3006.3
02e22c8
@m0duspwnens
handle salt for r9 and c9
c5610ed
@m0duspwnens
remove extra ||
13a5c8b
@m0duspwnens
all more os to set_os in so-common
e3830fa
@m0duspwnens
debian family upgrade salt without -r flag
84f8e1c
@m0duspwnens
handle debian family salt upgrade for soup
90bde94
@m0duspwnens
add wait_for_salt_minion to so-common
66ee074
@m0duspwnens
have soup wait_for_salt_minion() before running any highstate
37e8039
@m0duspwnens
update call to wait_for_salt_minion with new options in so-functions
dfcbbfd
@m0duspwnens
fix logging when using wait_for_minion
dbfccdf
@m0duspwnens
Merge remote-tracking branch 'origin/2.4/dev' into upgrade/salt3006.3
f03bbdb
@m0duspwnens
merge with dev, fix confict
752390b
@m0duspwnens
Merge remote-tracking branch 'origin/2.4/dev' into upgrade/salt3006.3
fab91ed
@m0duspwnens
if deb fam, stop salt-master and salt-minion after salt upgrade
6d34656
@m0duspwnens
if deb fam, stop salt-master and salt-minion after salt upgrade
180ba3a
@m0duspwnens
dont exit if salt isnt running
1d6e32f
@m0duspwnens
fix line to log properly
3e343bf
@m0duspwnens m0duspwnens merged commit 308e5ea into 2.4/dev Oct 24, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Oct 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@weslambert weslambert weslambert approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@m0duspwnens @weslambert