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.

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 2017.7 to 2018.3 #49770

Merged
merged 10 commits into from Sep 25, 2018

Conversation

Projects
None yet
5 participants
@rallytime
Copy link
Contributor

commented Sep 25, 2018

Conflicts:

  • salt/modules/win_system.py

twangboy and others added some commits Sep 18, 2018

Fix reboot needed detection
Fix the following:
- get_pending_update
- get_pending_domain_join
- get_pending_component_servicing
Mike Place
Mike Place
Merge pull request #49718 from vutny/doc/2017.7/add-missing-mock-kwarg
[DOC] Add missing `mock` argument for `state.apply`
Mike Place
Merge pull request #49703 from twangboy/fix_49675_2017.7
Detect when system needs reboot after domain join (2017.7)
Merge pull request #49749 from erwindon/docufix
fixed link in documentation
Merge pull request #49760 from Ch3LL/raid_docs
Add mdadm as dependency in mdadm state docs
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/win_system.py

@rallytime rallytime requested a review from twangboy Sep 25, 2018

@rallytime rallytime merged commit 4138683 into saltstack:2018.3 Sep 25, 2018

5 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Sep 25, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.