-
Notifications
You must be signed in to change notification settings - Fork 45
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
build(deps): bump salt from 3002.8 to 3003.5 in /salt/tests #3809
build(deps): bump salt from 3002.8 to 3003.5 in /salt/tests #3809
Conversation
Hello dependabot[bot],My role is to assist you with the merge of this Status report is not available. The following options are set: bypass_author_approval, bypass_jira_check |
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: bypass_author_approval, bypass_jira_check |
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( git fetch && \
git checkout origin/dependabot/pip/salt/tests/salt-3003.5 && \
git merge origin/development/123.0 Resolve merge conflicts and commit git push origin HEAD:dependabot/pip/salt/tests/salt-3003.5 The following options are set: bypass_author_approval, bypass_jira_check |
d2fbd1f
to
66db6e8
Compare
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: bypass_author_approval, bypass_jira_check |
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: bypass_author_approval, bypass_jira_check |
Branches have divergedThis pull request's source branch To avoid any integration risks, please re-synchronize them using one of the
Note: If you choose to rebase, you may have to ask me to rebuild The following options are set: bypass_author_approval, bypass_jira_check |
66db6e8
to
7b1adbe
Compare
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: bypass_author_approval, bypass_jira_check |
Branches have divergedThis pull request's source branch To avoid any integration risks, please re-synchronize them using one of the
Note: If you choose to rebase, you may have to ask me to rebuild The following options are set: bypass_author_approval, bypass_jira_check |
Bumps [salt](https://github.com/saltstack/salt) from 3002.8 to 3003.5. - [Release notes](https://github.com/saltstack/salt/releases) - [Changelog](https://github.com/saltstack/salt/blob/master/CHANGELOG.md) - [Commits](saltstack/salt@v3002.8...v3003.5) --- updated-dependencies: - dependency-name: salt dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
7b1adbe
to
4de15c8
Compare
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: bypass_author_approval, bypass_jira_check |
Superseded by #4477. |
Bumps salt from 3002.8 to 3003.5.
Release notes
Sourced from salt's releases.
Changelog
Sourced from salt's changelog.
... (truncated)
Commits
3fa1e4c
Merge pull request #460 from Ch3LL/docs_3003.5683b21b
Update release notes and man pages for 3003.588e9b86
Merge pull request #319 from saltstack/issue/3003.5/6186540478bc
Fix tests on MacOS58d5517
Fix the test_zeromq_filtering testfe9fb01
Fix bug in tcp transport3d53101
Merge pull request #305 from saltstack/cve/3003.4-pam-auth-fix08acb9b
pre-commit fixes42bbee0
Skip PAM auth tests on Windows124a6f0
rewrite hook changesDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)You can disable automated security fix PRs for this repo from the Security Alerts page.