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

[2018.3] Merge forward from 2018.3.2 to 2018.3 #48354

Merged
merged 20 commits into from Jun 28, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Contributor

rallytime commented Jun 28, 2018

Conflicts:

  • tests/integration/runners/test_state.py

garethgreenaway and others added some commits Jun 12, 2018

Ensure that the shared list of jids is passed when creating the Minio…
…n. Fixes an issue when minions are pointed at multiple syndics.
Some fixes to the set_pause and rm_pause function in the state runner…
…, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality.
Merge pull request #48137 from gtmanfred/2018.3.2
[2018.3.2] bootstrap kitchen branch tests with 2017.7.6
Merge pull request #48138 from rallytime/man-pages-2018.3.2
Update man pages for 2018.3.2
Merge pull request #48158 from gtmanfred/2018.3.2
always listen when gathering job info
Merge pull request #48171 from rallytime/2018.3.2-release-notes
Update release notes for 2018.3.2
Merge branch '2018.3.2' into '2018.3'
Conflicts:
  - tests/integration/runners/test_state.py

@rallytime rallytime requested a review from saltstack/team-core as a code owner Jun 28, 2018

@rallytime rallytime merged commit 0202493 into saltstack:2018.3 Jun 28, 2018

7 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
default Pull Requests » Salt PR - Main Build - PY2/PY3 #9828
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11072 — ABORTED
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26306 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18352 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6102 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24030 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22987 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20155 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3.2-to-2018.3 branch Jun 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment