diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index 91dfb4c45f..b9853447c2 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -536,7 +536,7 @@ Default: ``[]`` Only return events matching tags in a whitelist. -.. versionchanged:: Carbon +.. versionchanged:: 2016.11.0 Supports glob matching patterns. @@ -557,7 +557,7 @@ Default: ``[]`` Store all event returns _except_ the tags in a blacklist. -.. versionchanged:: Carbon +.. versionchanged:: 2016.11.0 Supports glob matching patterns. @@ -1379,7 +1379,7 @@ is impacted. ------------------------------ .. versionadded:: 2014.1.0 -.. versionchanged:: Carbon +.. versionchanged:: 2016.11.0 The default was changed from ``30`` seconds to ``20``. Default: ``20`` @@ -1576,7 +1576,7 @@ compatible version installed will be the provider that is used. ``gitfs_ssl_verify`` ******************** -.. versionchanged:: Carbon +.. versionchanged:: 2016.11.0 Default: ``True`` @@ -1586,7 +1586,7 @@ git repo that uses a self-signed certificate. However, keep in mind that setting this to anything other ``True`` is a considered insecure, and using an SSH-based transport (if available) may be a better option. -In the Carbon release, the default config value changed from ``False`` to +In the 2016.11.0 release, the default config value changed from ``False`` to ``True``. .. code-block:: yaml @@ -1664,7 +1664,7 @@ Defines which branch/tag should be used as the ``base`` environment. ``gitfs_saltenv`` ***************** -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 Default: ``[]`` @@ -2438,7 +2438,7 @@ There are additional details at :ref:`salt-pillars` ``pillar_roots_override_ext_pillar`` ------------------------------------ -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 Default: ``False`` @@ -2629,7 +2629,7 @@ files would be looked for in a subdirectory called ``pillar``. ************************* .. versionadded:: 2015.8.0 -.. versionchanged:: Carbon +.. versionchanged:: 2016.11.0 Default: ``False`` @@ -2639,7 +2639,7 @@ git repo that uses a self-signed certificate. However, keep in mind that setting this to anything other ``True`` is a considered insecure, and using an SSH-based transport (if available) may be a better option. -In the Carbon release, the default config value changed from ``False`` to +In the 2016.11.0 release, the default config value changed from ``False`` to ``True``. .. code-block:: yaml @@ -3594,7 +3594,7 @@ branch/tag. ---------------------- .. versionadded:: 2015.8.0 -.. versionchanged:: Carbon +.. versionchanged:: 2016.11.0 Default: ``False`` @@ -3604,7 +3604,7 @@ git repo that uses a self-signed certificate. However, keep in mind that setting this to anything other ``True`` is a considered insecure, and using an SSH-based transport (if available) may be a better option. -In the Carbon release, the default config value changed from ``False`` to +In the 2016.11.0 release, the default config value changed from ``False`` to ``True``. .. code-block:: yaml diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst index e3a9d00b5c..79d689fe72 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst @@ -1319,7 +1319,7 @@ This option has no default value. Set it to an environment name to ensure that ``top_file_merging_strategy`` ----------------------------- -.. versionchanged:: Carbon +.. versionchanged:: 2016.11.0 A ``merge_all`` strategy has been added. Default: ``merge`` @@ -1732,7 +1732,7 @@ the `cmd_blacklist_glob` list and any matched shell command will be blocked. `salt-call` commands. This does NOT blacklist commands called from states or shell commands executed from other modules. -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 .. code-block:: yaml @@ -1758,7 +1758,7 @@ blocked. If `cmd_whitelist_glob` is NOT SET, then all shell commands are permitt `salt-call` commands. This does NOT restrict commands called from states or shell commands executed from other modules. -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 .. code-block:: yaml @@ -2065,7 +2065,7 @@ have other services that need to go with it. ``winrepo_cache_expire_min`` ---------------------------- -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 Default: ``0`` @@ -2084,7 +2084,7 @@ will always refresh the metadata, regardless of age. ``winrepo_cache_expire_max`` ---------------------------- -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 Default: ``21600`` diff --git a/doc/ref/modules/index.rst b/doc/ref/modules/index.rst index 3e0d024dbf..79b5cc1071 100644 --- a/doc/ref/modules/index.rst +++ b/doc/ref/modules/index.rst @@ -156,7 +156,7 @@ module and pass the argument ``bar`` to it. Calling Execution Modules on the Salt Master ============================================ -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 Execution modules can now also be called via the :command:`salt-run` command using the :ref:`salt runner `. diff --git a/doc/ref/states/requisites.rst b/doc/ref/states/requisites.rst index f1e8a4972a..8259453b1e 100644 --- a/doc/ref/states/requisites.rst +++ b/doc/ref/states/requisites.rst @@ -371,8 +371,8 @@ The ``onfail`` requisite is applied in the same way as ``require`` as ``watch``: .. note:: - Beginning in the ``Carbon`` release of Salt, ``onfail`` uses OR logic for - multiple listed ``onfail`` requisites. Prior to the ``Carbon`` release, + Beginning in the ``2016.11.0`` release of Salt, ``onfail`` uses OR logic for + multiple listed ``onfail`` requisites. Prior to the ``2016.11.0`` release, ``onfail`` used AND logic. See `Issue #22370`_ for more information. .. _Issue #22370: https://github.com/saltstack/salt/issues/22370 diff --git a/doc/ref/states/top.rst b/doc/ref/states/top.rst index 587321988e..d4f6c1ec3a 100644 --- a/doc/ref/states/top.rst +++ b/doc/ref/states/top.rst @@ -440,7 +440,7 @@ environment, no states from the ``qa`` environment would be applied. Scenario 3 - No Environment Specified, :conf_minion:`top_file_merging_strategy` is "same" ----------------------------------------------------------------------------------------- -.. versionchanged:: Carbon +.. versionchanged:: 2016.11.0 In prior versions, "same" did not quite work as described below (see here__). This has now been corrected. It was decided that changing something like top file handling in a point release had the potential to @@ -461,7 +461,7 @@ and ``qa2`` from the ``qa`` environment would be applied to all minions. Scenario 4 - No Environment Specified, :conf_minion:`top_file_merging_strategy` is "merge_all" ---------------------------------------------------------------------------------------------- -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 In this scenario, all configured states in all top files are applied. From the ``base`` environment, ``base1`` would be applied to all minions, with ``base2`` diff --git a/doc/topics/cloud/vmware.rst b/doc/topics/cloud/vmware.rst index 7337f26518..cbe6ddcb0b 100644 --- a/doc/topics/cloud/vmware.rst +++ b/doc/topics/cloud/vmware.rst @@ -219,7 +219,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or the current VM/template\'s vCPU count is used. ``cores_per_socket`` - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 Enter the number of cores per vCPU that you want the VM/template to have. If not specified, this will default to 1. diff --git a/doc/topics/event/master_events.rst b/doc/topics/event/master_events.rst index b1f4c719b1..f39992b828 100644 --- a/doc/topics/event/master_events.rst +++ b/doc/topics/event/master_events.rst @@ -122,7 +122,7 @@ Runner Events .. salt:event:: salt/run//args - .. versionadded:: Carbon + .. versionadded:: 2016.11.0 Fired by the :mod:`state.orchestrate ` runner diff --git a/doc/topics/netapi/writing.rst b/doc/topics/netapi/writing.rst index e51c62b5b2..10317edf0d 100644 --- a/doc/topics/netapi/writing.rst +++ b/doc/topics/netapi/writing.rst @@ -43,7 +43,7 @@ actually starts the service. This is started in a multiprocess. Multiple instances ================== -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 :py:mod:`~salt.netapi.rest_cherrypy` and :py:mod:`~salt.netapi.rest_tornado` support running multiple instances by copying and renaming entire directory diff --git a/doc/topics/orchestrate/orchestrate_runner.rst b/doc/topics/orchestrate/orchestrate_runner.rst index eaa512582e..b3690b7de1 100644 --- a/doc/topics/orchestrate/orchestrate_runner.rst +++ b/doc/topics/orchestrate/orchestrate_runner.rst @@ -72,7 +72,7 @@ apply the states defined in that file. Masterless Orchestration ~~~~~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 To support salt orchestration on masterless minions, the Orchestrate Runner is available as an execution module. The syntax for masterless orchestration is diff --git a/doc/topics/proxyminion/index.rst b/doc/topics/proxyminion/index.rst index 3c3c3a5d71..7ad5ee0fa8 100644 --- a/doc/topics/proxyminion/index.rst +++ b/doc/topics/proxyminion/index.rst @@ -36,8 +36,8 @@ or more minions. See :doc:`Proxyminion Beacon ` to help with easy configuration and management of ``salt-proxy`` processes. -New in Carbon -------------- +New in 2016.11.0 +---------------- Proxy minions now support configuration files with names ending in '*.conf' and placed in /etc/salt/proxy.d. @@ -114,7 +114,7 @@ the rest of the proxy's grains. Since older proxy-minions might have used other methods to call such a function and add its results to grains, this is config-gated by a new proxy configuration option called ``proxy_merge_grains_in_module``. This defaults to ``False`` in this release. It will default to True in the release after -next. The next release is codenamed **Carbon**, the following is **Nitrogen**. +next. The next release is 2016.11.0, the following is **Nitrogen**. @@ -311,7 +311,7 @@ proxy minions will only see the keys specific to the proxies it will be handling. Proxies can be configured in /etc/salt/proxy or with files in /etc/salt/proxy.d as of -Salt's Carbon release. +Salt's 2016.11.0 release. Also, in general, proxy-minions are lightweight, so the machines that run them could conceivably control a large number of devices. To run more than one proxy from diff --git a/doc/topics/targeting/nodegroups.rst b/doc/topics/targeting/nodegroups.rst index 41008c6c90..e63d5b20bf 100644 --- a/doc/topics/targeting/nodegroups.rst +++ b/doc/topics/targeting/nodegroups.rst @@ -94,7 +94,7 @@ They can now also be defined as a YAML list, like this: - host2 - host3 -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 Using Nodegroups in SLS files ============================= diff --git a/doc/topics/tutorials/docker_sls.rst b/doc/topics/tutorials/docker_sls.rst index b5e9ca13d9..4712a3d906 100644 --- a/doc/topics/tutorials/docker_sls.rst +++ b/doc/topics/tutorials/docker_sls.rst @@ -1,7 +1,7 @@ Running Salt States and Commands in Docker Containers ===================================================== -The Carbon release of Salt introduces the ability to execute Salt States +The 2016.11.0 release of Salt introduces the ability to execute Salt States and Salt remote execution commands directly inside of Docker containers. This addition makes it possible to not only deploy fresh containers using diff --git a/doc/topics/tutorials/gitfs.rst b/doc/topics/tutorials/gitfs.rst index df85829ee3..0cd29afc37 100644 --- a/doc/topics/tutorials/gitfs.rst +++ b/doc/topics/tutorials/gitfs.rst @@ -398,9 +398,9 @@ In the example configuration above, the following is true: .. _gitfs-per-saltenv-config: Per-Saltenv Configuration Parameters -=================================== +==================================== -.. versionadded:: Carbon +.. versionadded:: 2016.11.0 For more granular control, Salt allows the following three things to be overridden for individual saltenvs within a given repo: diff --git a/doc/topics/utils/index.rst b/doc/topics/utils/index.rst index 0278f4e47d..48728174f5 100644 --- a/doc/topics/utils/index.rst +++ b/doc/topics/utils/index.rst @@ -5,7 +5,7 @@ Utility Modules - Code Reuse in Custom Modules ============================================== .. versionadded:: 2015.5.0 -.. versionchanged:: Carbon +.. versionchanged:: 2016.11.0 These can now be synced to the Master for use in custom Runners, and in custom execution modules called within Pillar SLS files.