-
Notifications
You must be signed in to change notification settings - Fork 44
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
Upgrade Salt to 3000.3
#2549
Upgrade Salt to 3000.3
#2549
Conversation
Change salt-master image to salt 3000.3 and download salt-minion version 3000.3
Hello teddyandrieux,My role is to assist you with the merge of this Status report is not available. |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/2.1/bugfix/salt-upgrade-3000-3 origin/development/2.1
$ git merge origin/bugfix/salt-upgrade-3000-3
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.1/bugfix/salt-upgrade-3000-3 |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/2.4/bugfix/salt-upgrade-3000-3 origin/development/2.4
$ git merge origin/w/2.3/bugfix/salt-upgrade-3000-3
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.4/bugfix/salt-upgrade-3000-3 |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/2.5/bugfix/salt-upgrade-3000-3 origin/development/2.5
$ git merge origin/w/2.4/bugfix/salt-upgrade-3000-3
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.5/bugfix/salt-upgrade-3000-3 |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/2.6/bugfix/salt-upgrade-3000-3 origin/development/2.6
$ git merge origin/w/2.5/bugfix/salt-upgrade-3000-3
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.6/bugfix/salt-upgrade-3000-3 |
What would change for us? |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
|
Fixed some bugs in Salt but nothing for us because we are not using the "things" that have been fixed. But anyway always good to have the last patch release |
/approve |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
The following options are set: approve |
Build failedThe build for commit did not succeed in branch w/2.5/bugfix/salt-upgrade-3000-3. The following options are set: approve |
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once IMPORTANT Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a The following options are set: approve |
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue None. Goodbye teddyandrieux. |
Component:
'salt', 'build'
Summary:
Change salt-master image to salt 3000.3 and download salt-minion version
3000.3
https://docs.saltstack.com/en/latest/topics/releases/3000.3.html