diff --git a/doc/ref/states/top.rst b/doc/ref/states/top.rst index 0e734649b4..c82f1445b2 100644 --- a/doc/ref/states/top.rst +++ b/doc/ref/states/top.rst @@ -438,7 +438,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 diff --git a/doc/topics/cloud/vsphere.rst b/doc/topics/cloud/vsphere.rst index b278f04aeb..49cfc8bbe6 100644 --- a/doc/topics/cloud/vsphere.rst +++ b/doc/topics/cloud/vsphere.rst @@ -4,11 +4,11 @@ Getting Started With vSphere .. note:: - .. deprecated:: Carbon + .. deprecated:: 2016.11.0 The :py:func:`vsphere ` cloud driver has been deprecated in favor of the :py:func:`vmware ` - cloud driver and will be removed in Salt Carbon. Please refer to + cloud driver and will be removed in Salt 2016.11.0. Please refer to :doc:`Getting started with VMware ` instead to get started with the configuration. diff --git a/doc/topics/releases/version_numbers.rst b/doc/topics/releases/version_numbers.rst index 0b2e9837ab..a0a4dc9972 100644 --- a/doc/topics/releases/version_numbers.rst +++ b/doc/topics/releases/version_numbers.rst @@ -28,7 +28,7 @@ Assigned codenames: - Lithium: ``2015.5.0`` - Beryllium: ``2015.8.0`` - Boron: ``2016.3.0`` -- Carbon: ``TBD`` +- Carbon: ``2016.11.0`` - Nitrogen: ``TBD`` Example diff --git a/salt/modules/alternatives.py b/salt/modules/alternatives.py index 547c028719..1e05907de1 100644 --- a/salt/modules/alternatives.py +++ b/salt/modules/alternatives.py @@ -67,7 +67,7 @@ def show_link(name): ''' Display master link for the alternative - .. versionadded:: 2015.8.13,2016.3.4,Carbon + .. versionadded:: 2015.8.13,2016.3.4,2016.11.0 CLI Example: diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py index fe0ce8841e..64fde8e139 100644 --- a/salt/modules/aptpkg.py +++ b/salt/modules/aptpkg.py @@ -389,7 +389,7 @@ def install(name=None, reinstall=False, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -844,7 +844,7 @@ def autoremove(list_only=False, purge=False): def remove(name=None, pkgs=None, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -888,7 +888,7 @@ def remove(name=None, pkgs=None, **kwargs): def purge(name=None, pkgs=None, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -932,7 +932,7 @@ def purge(name=None, pkgs=None, **kwargs): def upgrade(refresh=True, dist_upgrade=False, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd diff --git a/salt/modules/ebuild.py b/salt/modules/ebuild.py index eb87c76982..2651d72bff 100644 --- a/salt/modules/ebuild.py +++ b/salt/modules/ebuild.py @@ -463,7 +463,7 @@ def install(name=None, binhost=None, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -706,7 +706,7 @@ def install(name=None, def update(pkg, slot=None, fromrepo=None, refresh=False, binhost=None): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -799,7 +799,7 @@ def update(pkg, slot=None, fromrepo=None, refresh=False, binhost=None): def upgrade(refresh=True, binhost=None, backtrack=3): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -887,7 +887,7 @@ def upgrade(refresh=True, binhost=None, backtrack=3): def remove(name=None, slot=None, fromrepo=None, pkgs=None, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -986,7 +986,7 @@ def remove(name=None, slot=None, fromrepo=None, pkgs=None, **kwargs): def purge(name=None, slot=None, fromrepo=None, pkgs=None, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd diff --git a/salt/modules/git.py b/salt/modules/git.py index 8a80048dba..d164cd6cef 100644 --- a/salt/modules/git.py +++ b/salt/modules/git.py @@ -1515,7 +1515,7 @@ def diff(cwd, cached=False, paths=None): ''' - .. versionadded:: 2015.8.12,2016.3.3,Carbon + .. versionadded:: 2015.8.12,2016.3.3,2016.11.0 Interface to `git-diff(1)`_ diff --git a/salt/modules/pacman.py b/salt/modules/pacman.py index 4b12a53497..0e32b84323 100644 --- a/salt/modules/pacman.py +++ b/salt/modules/pacman.py @@ -289,7 +289,7 @@ def install(name=None, sources=None, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -452,7 +452,7 @@ def install(name=None, def upgrade(refresh=False, root=None, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -569,7 +569,7 @@ def _uninstall(action='remove', name=None, pkgs=None, **kwargs): def remove(name=None, pkgs=None, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -613,7 +613,7 @@ def remove(name=None, pkgs=None, **kwargs): def purge(name=None, pkgs=None, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd diff --git a/salt/modules/systemd.py b/salt/modules/systemd.py index a14726f596..7b89014e1d 100644 --- a/salt/modules/systemd.py +++ b/salt/modules/systemd.py @@ -539,7 +539,7 @@ def missing(name): def unmask(name): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands run by this function from the ``salt-minion`` daemon's control group. This is done to avoid a race condition in cases where @@ -578,7 +578,7 @@ def unmask(name): def mask(name, runtime=False): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands run by this function from the ``salt-minion`` daemon's control group. This is done to avoid a race condition in cases where @@ -647,7 +647,7 @@ def masked(name): def start(name): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands run by this function from the ``salt-minion`` daemon's control group. This is done to avoid a race condition in cases where @@ -675,7 +675,7 @@ def start(name): def stop(name): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands run by this function from the ``salt-minion`` daemon's control group. This is done to avoid a race condition in cases where @@ -702,7 +702,7 @@ def stop(name): def restart(name): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands run by this function from the ``salt-minion`` daemon's control group. This is done to avoid a race condition in cases where @@ -730,7 +730,7 @@ def restart(name): def reload_(name): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands run by this function from the ``salt-minion`` daemon's control group. This is done to avoid a race condition in cases where @@ -758,7 +758,7 @@ def reload_(name): def force_reload(name): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands run by this function from the ``salt-minion`` daemon's control group. This is done to avoid a race condition in cases where @@ -809,7 +809,7 @@ def status(name, sig=None): # pylint: disable=unused-argument # established by Salt's service management states. def enable(name, **kwargs): # pylint: disable=unused-argument ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands run by this function from the ``salt-minion`` daemon's control group. This is done to avoid a race condition in cases where @@ -853,7 +853,7 @@ def enable(name, **kwargs): # pylint: disable=unused-argument # established by Salt's service management states. def disable(name, **kwargs): # pylint: disable=unused-argument ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands run by this function from the ``salt-minion`` daemon's control group. This is done to avoid a race condition in cases where diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py index d797195fbb..be008cd45b 100644 --- a/salt/modules/yumpkg.py +++ b/salt/modules/yumpkg.py @@ -897,7 +897,7 @@ def install(name=None, normalize=True, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -1272,7 +1272,7 @@ def upgrade(name=None, not be installed. .. versionchanged:: 2014.7.0 - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -1414,7 +1414,7 @@ def upgrade(name=None, def remove(name=None, pkgs=None, **kwargs): # pylint: disable=W0613 ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -1495,7 +1495,7 @@ def remove(name=None, pkgs=None, **kwargs): # pylint: disable=W0613 def purge(name=None, pkgs=None, **kwargs): # pylint: disable=W0613 ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index ca14427b4a..3f3e7813e6 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -893,7 +893,7 @@ def install(name=None, ignore_repo_failure=False, **kwargs): ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -1078,7 +1078,7 @@ def upgrade(refresh=True, skip_verify=False, **kwargs): # pylint: disable=unused-argument ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -1216,7 +1216,7 @@ def _uninstall(name=None, pkgs=None): def remove(name=None, pkgs=None, **kwargs): # pylint: disable=unused-argument ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd @@ -1260,7 +1260,7 @@ def remove(name=None, pkgs=None, **kwargs): # pylint: disable=unused-argument def purge(name=None, pkgs=None, **kwargs): # pylint: disable=unused-argument ''' - .. versionchanged:: 2015.8.12,2016.3.3,Carbon + .. versionchanged:: 2015.8.12,2016.3.3,2016.11.0 On minions running systemd>=205, `systemd-run(1)`_ is now used to isolate commands which modify installed packages from the ``salt-minion`` daemon's control group. This is done to keep systemd