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 #27310 from basepi/merge-forward-2015.5

Browse source 
[2015.5] Merge forward from 2014.7 to 2015.5
This commit is contained in:
Colton Myers 2015-09-22 15:08:41 -06:00
commit ca4597b93a
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ref/configuration/master.rst
View file

@ -415,7 +415,7 @@ configuration requirements. Read the returner's documentation.
``master_job_cache``
--------------------
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
Default: 'local_cache'

2
doc/topics/mine/index.rst
View file

@ -37,7 +37,7 @@ Mine Functions Aliases
Function aliases can be used to provide usage intentions or to allow multiple
calls of the same function with different arguments.
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
.. code-block:: yaml

6
salt/modules/network.py
View file

@ -650,7 +650,7 @@ def interface(iface):
'''
Return the inet address for a given interface
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
CLI Example:
@ -665,7 +665,7 @@ def interface_ip(iface):
'''
Return the inet address for a given interface
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
CLI Example:
@ -833,7 +833,7 @@ def connect(host, port=None, **kwargs):
Test connectivity to a host using a particular
port from the minion.
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
CLI Example:

4
salt/modules/saltutil.py
View file

@ -800,7 +800,7 @@ def runner(_fun, **kwargs):
'''
Execute a runner module (this function must be run on the master)
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
name
The name of the function to run
@ -830,7 +830,7 @@ def wheel(_fun, **kwargs):
'''
Execute a wheel module (this function must be run on the master)
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
name
The name of the function to run

6
salt/states/saltmod.py
View file

@ -451,7 +451,7 @@ def wait_for_event(
'''
Watch Salt's event bus and block until a condition is met
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
name
An event tag to watch for; supports Reactor-style globbing.
@ -552,7 +552,7 @@ def runner(name, **kwargs):
'''
Execute a runner module on the master
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
name
The name of the function to run
@ -581,7 +581,7 @@ def wheel(name, **kwargs):
'''
Execute a wheel module on the master
.. versionadded:: 2014.7
.. versionadded:: 2014.7.0
name
The name of the function to run