saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #37731 from rallytime/merge-2016.3

Browse source 
[2016.3] Merge forward from 2015.8 to 2016.3
This commit is contained in:
Nicole Thomas 2016-11-16 10:13:02 -07:00 • committed by GitHub
commit 98e25c68aa
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/win_servermanager.py
View file

@ -158,7 +158,8 @@ def install(feature, recurse=False, source=None, restart=False, exclude=None):
:param str exclude: The name of the feature to exclude when installing the
named feature.
..note:: As there is no exclude option for the ``Add-WindowsFeature``
.. note::
As there is no exclude option for the ``Add-WindowsFeature``
command, the feature will be installed with other sub-features and
will then be removed.

2
salt/states/pkg.py
View file

@ -3,7 +3,7 @@
Installation of packages using OS package managers such as yum or apt-get
=========================================================================
..note::
.. note::
On minions running systemd>=205, as of version 2015.8.12, 2016.3.3, and
Carbon, `systemd-run(1)`_ is now used to isolate commands which modify
installed packages from the ``salt-minion`` daemon's control group. This is