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 #23409 from terminalmage/update-lithium-docstrings-2014.7

Browse source 
Update Lithium docstrings in 2014.7 branch
This commit is contained in:
Justin Findlay 2015-05-06 10:20:46 -06:00
commit 160f703296
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/topics/tutorials/gitfs.rst
View file

@ -129,7 +129,7 @@ For APT-based distros such as Ubuntu and Debian:
switching to a new :conf_master:`gitfs_provider`, but it is less important
when switching between GitPython and pygit2.
Beginning in version 2015.2.0, the gitfs cache can be easily cleared using
Beginning in version 2015.5.0, the gitfs cache can be easily cleared using
the :mod:`fileserver.clear_cache <salt.runners.fileserver.clear_cache>`
runner.
@ -183,7 +183,7 @@ master:
.. note::
Dulwich does not recognize ``ssh://`` URLs, ``git+ssh://`` must be used
instead. Salt version 2015.2.0 and later will automatically add the
instead. Salt version 2015.5.0 and later will automatically add the
``git+`` to the beginning of these URLs before fetching, but earlier
Salt versions will fail to fetch unless the URL is specified using
``git+ssh://``.

18
salt/runners/fileserver.py
View file

@ -15,7 +15,7 @@ def envs(backend=None, sources=False, outputter='nested'):
backend
Narrow fileserver backends to a subset of the enabled ones.
.. versionchanged:: 2015.2.0::
.. versionchanged:: 2015.5.0
If all passed backends start with a minus sign (``-``), then these
backends will be excluded from the enabled backends. However, if
there is a mix of backends with and without a minus sign (ex:
@ -58,7 +58,7 @@ def file_list(saltenv='base', backend=None, outputter='nested'):
``backend=-roots,git``) then the ones starting with a minus sign will
be disregarded.
.. versionadded:: 2015.2.0
.. versionadded:: 2015.5.0
CLI Examples:
@ -94,7 +94,7 @@ def symlink_list(saltenv='base', backend=None, outputter='nested'):
``backend=-roots,git``) then the ones starting with a minus sign will
be disregarded.
.. versionadded:: 2015.2.0
.. versionadded:: 2015.5.0
CLI Example:
@ -130,7 +130,7 @@ def dir_list(saltenv='base', backend=None, outputter='nested'):
``backend=-roots,git``) then the ones starting with a minus sign will
be disregarded.
.. versionadded:: 2015.2.0
.. versionadded:: 2015.5.0
CLI Example:
@ -153,7 +153,7 @@ def dir_list(saltenv='base', backend=None, outputter='nested'):
def empty_dir_list(saltenv='base', backend=None, outputter='nested'):
'''
.. versionadded:: 2015.2.0
.. versionadded:: 2015.5.0
Return a list of empty directories in the given environment
@ -200,7 +200,7 @@ def update(backend=None):
backend
Narrow fileserver backends to a subset of the enabled ones.
.. versionchanged:: 2015.2.0
.. versionchanged:: 2015.5.0
If all passed backends start with a minus sign (``-``), then these
backends will be excluded from the enabled backends. However, if
there is a mix of backends with and without a minus sign (ex:
@ -225,7 +225,7 @@ def update(backend=None):
def clear_cache(backend=None):
'''
.. versionadded:: 2015.2.0
.. versionadded:: 2015.5.0
Clear the fileserver cache from VCS fileserver backends (:mod:`git
<salt.fileserver.gitfs>`, :mod:`hg <salt.fileserver.hgfs>`, :mod:`svn
@ -263,7 +263,7 @@ def clear_cache(backend=None):
def clear_lock(backend=None, remote=None):
'''
.. versionadded:: 2015.2.0
.. versionadded:: 2015.5.0
Clear the fileserver update lock from VCS fileserver backends (:mod:`git
<salt.fileserver.gitfs>`, :mod:`hg <salt.fileserver.hgfs>`, :mod:`svn
@ -304,7 +304,7 @@ def clear_lock(backend=None, remote=None):
def lock(backend=None, remote=None):
'''
.. versionadded:: 2015.2.0
.. versionadded:: 2015.5.0
Set a fileserver update lock for VCS fileserver backends (:mod:`git
<salt.fileserver.gitfs>`, :mod:`hg <salt.fileserver.hgfs>`, :mod:`svn