From 85d2145fe68a6c1a997bc95b3adaa599ef37933b Mon Sep 17 00:00:00 2001 From: rallytime Date: Thu, 27 Oct 2016 10:40:01 -0600 Subject: [PATCH] Update Carbon versionadded tags to 2016.11.0 in runners/* --- salt/runners/auth.py | 2 +- salt/runners/event.py | 4 +--- salt/runners/fileserver.py | 2 +- salt/runners/manage.py | 22 +++++++++++----------- salt/runners/salt.py | 2 +- salt/runners/saltutil.py | 2 +- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/salt/runners/auth.py b/salt/runners/auth.py index a7619d858e..8aec8c3389 100644 --- a/salt/runners/auth.py +++ b/salt/runners/auth.py @@ -2,7 +2,7 @@ ''' Authentication runner for creating, deleting, and managing eauth tokens. -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 ''' diff --git a/salt/runners/event.py b/salt/runners/event.py index 05fc4d6aa0..55be0ecdd5 100644 --- a/salt/runners/event.py +++ b/salt/runners/event.py @@ -2,7 +2,7 @@ ''' Module for sending events using the runner system. -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 ''' from __future__ import absolute_import @@ -18,8 +18,6 @@ def send(tag, data=None): ''' Send an event with the given tag and data. - .. versionadded:: Carbon - This is useful for sending events directly to the master from the shell with salt-run. It is also quite useful for sending events in orchestration states where the ``fire_event`` requisite isn't sufficient because it does diff --git a/salt/runners/fileserver.py b/salt/runners/fileserver.py index 2590077c1a..c5c416ddc0 100644 --- a/salt/runners/fileserver.py +++ b/salt/runners/fileserver.py @@ -41,7 +41,7 @@ def envs(backend=None, sources=False): def clear_file_list_cache(saltenv=None, backend=None): ''' - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 The Salt fileserver caches the files/directories/symlinks for each fileserver backend and environment as they are requested. This is done to diff --git a/salt/runners/manage.py b/salt/runners/manage.py index 803aba43f6..c4092fd2f5 100644 --- a/salt/runners/manage.py +++ b/salt/runners/manage.py @@ -658,17 +658,17 @@ def bootstrap(version='develop', hosts need to exist in the specified roster. root_user : False - Prepend ``root@`` to each host. Default changed in Salt Carbon from ``True`` + Prepend ``root@`` to each host. Default changed in Salt 2016.11.0 from ``True`` to ``False``. - .. versionchanged:: Carbon + .. versionchanged:: 2016.11.0 - .. deprecated:: Carbon + .. deprecated:: 2016.11.0 script_args Any additional arguments that you want to pass to the script. - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 roster : flat The roster to use for Salt SSH. More information about roster files can @@ -677,41 +677,41 @@ def bootstrap(version='develop', A full list of roster types, see the :ref:`builtin roster modules ` documentation. - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 ssh_user If ``user`` isn't found in the ``roster``, a default SSH user can be set here. Keep in mind that ``ssh_user`` will not override the roster ``user`` value if it is already defined. - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 ssh_password If ``passwd`` isn't found in the ``roster``, a default SSH password can be set here. Keep in mind that ``ssh_password`` will not override the roster ``passwd`` value if it is already defined. - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 ssh_privkey If ``priv`` isn't found in the ``roster``, a default SSH private key can be set here. Keep in mind that ``ssh_password`` will not override the roster ``passwd`` value if it is already defined. - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 tmp_dir : /tmp/.bootstrap The temporary directory to download the bootstrap script in. This directory will have ``-`` appended to it. For example: ``/tmp/.bootstrap-a19a728e-d40a-4801-aba9-d00655c143a7/`` - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 http_backend : tornado The backend library to use to download the script. If you need to use a ``file:///`` URL, then you should set this to ``urllib2``. - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 CLI Example: @@ -727,7 +727,7 @@ def bootstrap(version='develop', ''' dep_warning = ( - 'Starting with Salt Carbon, manage.bootstrap now uses Salt SSH to ' + 'Starting with Salt 2016.11.0, manage.bootstrap now uses Salt SSH to ' 'connect, and requires a roster entry. Please ensure that a roster ' 'entry exists for this host. Non-roster hosts will no longer be ' 'supported starting with Salt Oxygen.' diff --git a/salt/runners/salt.py b/salt/runners/salt.py index a12d6049bd..b699a7d92d 100644 --- a/salt/runners/salt.py +++ b/salt/runners/salt.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 This runner makes Salt's execution modules available diff --git a/salt/runners/saltutil.py b/salt/runners/saltutil.py index 644e35c0f7..5e6a43b480 100644 --- a/salt/runners/saltutil.py +++ b/salt/runners/saltutil.py @@ -253,7 +253,7 @@ def sync_pillar(saltenv='base'): def sync_utils(saltenv='base'): ''' - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 Sync utils modules from ``salt://_utils`` to the master