From 742d0a6b0413a6bcb027c1ba6ba5a6a8c1ac895e Mon Sep 17 00:00:00 2001 From: rallytime Date: Wed, 10 Feb 2016 15:45:28 -0700 Subject: [PATCH 1/2] Change all relevant Boron references to 2016.3.0 And more Boron deprecation warnings to Carbon --- conf/proxy | 2 +- doc/ref/configuration/master.rst | 2 +- doc/ref/configuration/minion.rst | 2 +- doc/ref/states/requisites.rst | 4 +- doc/topics/cloud/linode.rst | 6 +- doc/topics/cloud/softlayer.rst | 2 +- doc/topics/cloud/vmware.rst | 4 +- .../development/conventions/documentation.rst | 2 +- doc/topics/proxyminion/index.rst | 2 +- doc/topics/releases/boron.rst | 6 +- doc/topics/releases/version_numbers.rst | 3 +- doc/topics/tutorials/esxi_proxy_minion.rst | 4 +- salt/beacons/adb.py | 2 +- salt/beacons/glxinfo.py | 2 +- salt/beacons/memusage.py | 2 +- salt/beacons/pkg.py | 2 +- salt/client/mixins.py | 2 +- salt/client/ssh/wrapper/state.py | 8 +- salt/cloud/clouds/digital_ocean.py | 12 +- salt/cloud/clouds/linode.py | 8 +- salt/cloud/clouds/nova.py | 12 +- salt/cloud/clouds/opennebula.py | 126 +++++++++--------- salt/cloud/clouds/softlayer_hw.py | 2 +- salt/cloud/clouds/vmware.py | 2 +- salt/cloud/clouds/vultrpy.py | 2 +- salt/config/__init__.py | 2 +- salt/engines/logentries.py | 2 +- salt/engines/redis_sentinel.py | 2 +- salt/engines/slack.py | 2 +- salt/fileclient.py | 100 +++++++------- salt/fileserver/__init__.py | 28 ++-- salt/fileserver/azurefs.py | 8 +- salt/fileserver/hgfs.py | 20 +-- salt/fileserver/minionfs.py | 12 +- salt/fileserver/roots.py | 20 +-- salt/fileserver/s3fs.py | 20 +-- salt/fileserver/svnfs.py | 12 +- salt/grains/core.py | 2 +- salt/minion.py | 8 +- salt/modules/augeas_cfg.py | 12 +- salt/modules/bcache.py | 2 +- salt/modules/blockdev.py | 10 +- salt/modules/boto_cloudtrail.py | 2 +- salt/modules/boto_datapipeline.py | 2 +- salt/modules/boto_ec2.py | 28 ++-- salt/modules/boto_elb.py | 8 +- salt/modules/boto_iam.py | 10 +- salt/modules/boto_iot.py | 2 +- salt/modules/boto_lambda.py | 2 +- salt/modules/boto_s3_bucket.py | 2 +- salt/modules/boto_secgroup.py | 4 +- salt/modules/boto_vpc.py | 20 +-- salt/modules/cmdmod.py | 26 ++-- salt/modules/cp.py | 66 ++++----- salt/modules/data.py | 12 +- salt/modules/deb_apache.py | 6 +- salt/modules/debconfmod.py | 4 +- salt/modules/disk.py | 8 +- salt/modules/dockercompose.py | 2 +- salt/modules/dockerio.py | 12 +- salt/modules/etcd_mod.py | 4 +- salt/modules/ethtool.py | 2 +- salt/modules/file.py | 4 +- salt/modules/firewalld.py | 14 +- salt/modules/git.py | 14 +- salt/modules/github.py | 2 +- salt/modules/glance.py | 12 +- salt/modules/grains.py | 2 +- salt/modules/hashutil.py | 6 +- salt/modules/hosts.py | 2 +- salt/modules/infoblox.py | 2 +- salt/modules/jenkins.py | 2 +- salt/modules/k8s.py | 2 +- salt/modules/ldap3.py | 2 +- salt/modules/lxc.py | 18 +-- salt/modules/mac_group.py | 4 +- salt/modules/mac_power.py | 2 +- salt/modules/mac_service.py | 2 +- salt/modules/mac_system.py | 2 +- salt/modules/mac_user.py | 6 +- salt/modules/mdata.py | 2 +- salt/modules/monit.py | 10 +- salt/modules/netaddress.py | 2 +- salt/modules/network.py | 2 +- salt/modules/npm.py | 2 +- salt/modules/opkg.py | 2 +- salt/modules/pillar.py | 2 +- salt/modules/pip.py | 14 +- salt/modules/pkg_resource.py | 4 +- salt/modules/pkgin.py | 6 +- salt/modules/postgres.py | 20 +-- salt/modules/pushover_notify.py | 2 +- salt/modules/pw_user.py | 2 +- salt/modules/rabbitmq.py | 2 +- salt/modules/redismod.py | 4 +- salt/modules/reg.py | 50 +++---- salt/modules/rsync.py | 6 +- salt/modules/selinux.py | 6 +- salt/modules/smartos_virt.py | 6 +- salt/modules/solaris_fmadm.py | 2 +- salt/modules/solaris_system.py | 2 +- salt/modules/splunk.py | 2 +- salt/modules/ssh.py | 16 +-- salt/modules/state.py | 34 ++--- salt/modules/status.py | 2 +- salt/modules/sysfs.py | 2 +- salt/modules/sysmod.py | 2 +- salt/modules/systemd.py | 4 +- salt/modules/telemetry.py | 2 +- salt/modules/timezone.py | 2 +- salt/modules/tomcat.py | 4 +- salt/modules/vboxmanage.py | 2 +- salt/modules/virt.py | 16 +-- salt/modules/virtualenv_mod.py | 18 +-- salt/modules/win_iis.py | 2 +- salt/modules/win_network.py | 2 +- salt/modules/win_system.py | 4 +- salt/modules/win_task.py | 2 +- salt/modules/xapi.py | 6 +- salt/modules/yumpkg.py | 14 +- salt/modules/zenoss.py | 4 +- salt/modules/zfs.py | 34 ++--- salt/modules/zpool.py | 48 +++---- salt/netapi/__init__.py | 2 +- salt/netapi/rest_cherrypy/app.py | 2 +- salt/pillar/__init__.py | 12 +- salt/pillar/mysql.py | 6 +- salt/pillar/sqlcipher.py | 2 +- salt/pillar/stack.py | 2 +- salt/queues/pgjsonb_queue.py | 2 +- salt/renderers/gpg.py | 4 +- salt/returners/carbon_return.py | 2 +- salt/returners/couchdb_return.py | 2 +- salt/returners/hipchat_return.py | 2 +- salt/returners/influxdb_return.py | 2 +- salt/returners/memcache_return.py | 2 +- salt/returners/mongo_future_return.py | 2 +- salt/returners/mongo_return.py | 4 +- salt/returners/mysql.py | 2 +- salt/returners/nagios_return.py | 2 +- salt/returners/odbc.py | 2 +- salt/returners/pgjsonb.py | 2 +- salt/returners/postgres.py | 2 +- salt/returners/pushover_returner.py | 4 +- salt/returners/redis_return.py | 2 +- salt/returners/slack_returner.py | 2 +- salt/returners/smtp_return.py | 2 +- salt/returners/sqlite3_return.py | 2 +- salt/returners/xmpp_return.py | 2 +- salt/runners/cache.py | 12 +- salt/runners/fileserver.py | 10 +- salt/runners/jobs.py | 8 +- salt/runners/saltutil.py | 26 +--- salt/runners/spacewalk.py | 2 +- salt/runners/state.py | 2 +- salt/serializers/configparser.py | 2 +- salt/serializers/python.py | 2 +- salt/state.py | 4 +- salt/states/apache_conf.py | 2 +- salt/states/apache_site.py | 2 +- salt/states/archive.py | 4 +- salt/states/augeas.py | 2 +- salt/states/boto_cloudtrail.py | 2 +- salt/states/boto_ec2.py | 14 +- salt/states/boto_elb.py | 2 +- salt/states/boto_iam.py | 4 +- salt/states/boto_iot.py | 2 +- salt/states/boto_lambda.py | 2 +- salt/states/boto_s3_bucket.py | 2 +- salt/states/boto_secgroup.py | 8 +- salt/states/boto_vpc.py | 4 +- salt/states/chocolatey.py | 2 +- salt/states/cmd.py | 4 +- salt/states/cron.py | 6 +- salt/states/file.py | 20 +-- salt/states/firewall.py | 2 +- salt/states/firewalld.py | 2 +- salt/states/git.py | 6 +- salt/states/github.py | 2 +- salt/states/glance.py | 12 +- salt/states/gpg.py | 2 +- salt/states/grafana_dashboard.py | 2 +- salt/states/grafana_datasource.py | 2 +- salt/states/grains.py | 18 +-- salt/states/host.py | 2 +- salt/states/infoblox.py | 2 +- salt/states/jenkins.py | 2 +- salt/states/k8s.py | 2 +- salt/states/kmod.py | 4 +- salt/states/ldap.py | 2 +- salt/states/lxc.py | 8 +- salt/states/pkg.py | 4 +- salt/states/pkgrepo.py | 2 +- salt/states/postgres_initdb.py | 2 +- salt/states/postgres_language.py | 2 +- salt/states/postgres_privileges.py | 2 +- salt/states/postgres_user.py | 2 +- salt/states/redismod.py | 2 +- salt/states/reg.py | 4 +- salt/states/rsync.py | 2 +- salt/states/saltmod.py | 4 +- salt/states/selinux.py | 4 +- salt/states/smartos.py | 2 +- salt/states/splunk.py | 2 +- salt/states/ssh_known_hosts.py | 2 +- salt/states/telemetry_alert.py | 2 +- salt/states/virt.py | 22 +-- salt/states/win_iis.py | 2 +- salt/states/win_system.py | 2 +- salt/states/zcbuildout.py | 2 +- salt/states/zenoss.py | 2 +- salt/states/zfs.py | 2 +- salt/states/zpool.py | 2 +- salt/template.py | 6 +- salt/utils/cloud.py | 2 +- salt/utils/gitfs.py | 16 +-- salt/utils/jid.py | 4 +- salt/utils/jinja.py | 4 +- salt/utils/mac_utils.py | 2 +- salt/utils/mako.py | 4 +- salt/utils/master.py | 4 +- salt/utils/network.py | 6 +- salt/utils/openstack/nova.py | 14 +- salt/utils/pushover.py | 2 +- salt/utils/pydsl.py | 4 +- salt/utils/slack.py | 2 +- salt/utils/url.py | 4 +- salt/wheel/file_roots.py | 16 +-- salt/wheel/pillar_roots.py | 16 +-- setup.py | 8 +- tests/integration/states/compiler.py | 4 +- 231 files changed, 814 insertions(+), 841 deletions(-) diff --git a/conf/proxy b/conf/proxy index 472df35af5..f53920be4c 100644 --- a/conf/proxy +++ b/conf/proxy @@ -13,7 +13,7 @@ #default_include: minion.d/*.conf # Backwards compatibility option for proxymodules created before 2015.8.2 -# This setting will default to 'False' in the Boron release +# This setting will default to 'False' in the 2016.3.0 release # Setting this to True adds proxymodules to the __opts__ dictionary. # This breaks several Salt features (basically anything that serializes # __opts__ over the wire) but retains backwards compatibility. diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index 668209aebf..8fc342f307 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -216,7 +216,7 @@ The directory to store the pki authentication keys. ``extension_modules`` --------------------- -.. versionchanged:: Boron +.. versionchanged:: 2016.3.0 The default location for this directory has been moved. Prior to this version, the location was a directory named ``extmods`` in the Salt cachedir (on most platforms, ``/var/cache/salt/extmods``). It has been diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst index 94593df7ae..e47e377769 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst @@ -393,7 +393,7 @@ to enable set grains_cache to ``True``. ``grains_deep_merge`` --------------------- -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Default: ``False`` diff --git a/doc/ref/states/requisites.rst b/doc/ref/states/requisites.rst index 4e656175c7..155519f766 100644 --- a/doc/ref/states/requisites.rst +++ b/doc/ref/states/requisites.rst @@ -101,9 +101,9 @@ first line in the stanza) or the ``- name`` parameter. Omitting state module in requisites ----------------------------------- -.. versionadded:: Boron +.. versionadded:: 2016.3.0 -In version Boron, the state module name was made optional. If the state module +In version 2016.3.0, the state module name was made optional. If the state module is omitted, all states matching the ID will be required, regardless of which module they are using. diff --git a/doc/topics/cloud/linode.rst b/doc/topics/cloud/linode.rst index 27f5815590..de35c1e30f 100644 --- a/doc/topics/cloud/linode.rst +++ b/doc/topics/cloud/linode.rst @@ -184,17 +184,17 @@ and price. Required. assign_private_ip ----------------- -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Assigns a private IP address to a Linode when set to True. Default is False. private_ip ---------- -Deprecated in favor of `assign_private_ip`_ in Salt Boron. +Deprecated in favor of `assign_private_ip`_ in Salt 2016.3.0. ssh_interface ------------- -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Specify whether to use a public or private IP for the deploy script. Valid options are: diff --git a/doc/topics/cloud/softlayer.rst b/doc/topics/cloud/softlayer.rst index 846b5c53eb..1edf8e22d9 100644 --- a/doc/topics/cloud/softlayer.rst +++ b/doc/topics/cloud/softlayer.rst @@ -192,7 +192,7 @@ Name) which is a result of combining the ``domain`` configuration value and the Minion name specified either via the CLI or a map file rather than only using the short host name, or Minion ID. Default is False. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 For example, if the value of ``domain`` is ``example.com`` and a new VM was created via the CLI with ``salt-cloud -p base_softlayer_ubuntu my-vm``, the resulting diff --git a/doc/topics/cloud/vmware.rst b/doc/topics/cloud/vmware.rst index db57caf9e5..c1b7d4b6a7 100644 --- a/doc/topics/cloud/vmware.rst +++ b/doc/topics/cloud/vmware.rst @@ -240,7 +240,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or Enter the size of disk in GB thin_provision Specifies whether the disk should be thin provisioned or not. Default is ``thin_provision: False``. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 controller Specify the SCSI controller label to which this disk should be attached. This should be specified only when creating both the specified SCSI @@ -521,7 +521,7 @@ Example of a minimal profile: Creating a VM ============= -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Creating a VM from scratch means that more configuration has to be specified in the profile because there is no place to inherit configuration from. diff --git a/doc/topics/development/conventions/documentation.rst b/doc/topics/development/conventions/documentation.rst index 8eb4e171de..8315f967e1 100644 --- a/doc/topics/development/conventions/documentation.rst +++ b/doc/topics/development/conventions/documentation.rst @@ -139,7 +139,7 @@ For changes to a function: ''' Upper-case the given value - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Added a flag to also strip whitespace from the string. <...snip...> diff --git a/doc/topics/proxyminion/index.rst b/doc/topics/proxyminion/index.rst index 88331e5613..aa4d9d327e 100644 --- a/doc/topics/proxyminion/index.rst +++ b/doc/topics/proxyminion/index.rst @@ -43,7 +43,7 @@ New in 2015.8.2 The `proxymodule` variable has been moved a new globally-injected variable called `__proxy__`. A related configuration option called `add_proxymodule_to_opts` has been added and defaults to `True`. In the next -major release, codenamed Boron, this variable will default to False. +major release, 2016.3.0, this variable will default to False. In the meantime, proxies that functioned under 2015.8.0 and .1 should continue to work under 2015.8.2. You should rework your proxy code to use `__proxy__` as diff --git a/doc/topics/releases/boron.rst b/doc/topics/releases/boron.rst index 7b82a70dec..854e5f5ed4 100644 --- a/doc/topics/releases/boron.rst +++ b/doc/topics/releases/boron.rst @@ -1,8 +1,8 @@ :orphan: -=================================== -Salt Release Notes - Codename Boron -=================================== +============================================ +Salt 2016.3.0 Release Notes - Codename Boron +============================================ Backwards-incompatible Changes ============================== diff --git a/doc/topics/releases/version_numbers.rst b/doc/topics/releases/version_numbers.rst index c0a1409337..0b2e9837ab 100644 --- a/doc/topics/releases/version_numbers.rst +++ b/doc/topics/releases/version_numbers.rst @@ -27,8 +27,9 @@ Assigned codenames: - Helium: ``2014.7.0`` - Lithium: ``2015.5.0`` - Beryllium: ``2015.8.0`` -- Boron: ``TBD`` +- Boron: ``2016.3.0`` - Carbon: ``TBD`` +- Nitrogen: ``TBD`` Example ------- diff --git a/doc/topics/tutorials/esxi_proxy_minion.rst b/doc/topics/tutorials/esxi_proxy_minion.rst index 89ce4f422d..001bc19846 100644 --- a/doc/topics/tutorials/esxi_proxy_minion.rst +++ b/doc/topics/tutorials/esxi_proxy_minion.rst @@ -145,10 +145,10 @@ will connect to. .. note:: - If you're running your ESXi Proxy Minion on version of Salt that is 2015.8.4 + If you're running your ESXi Proxy Minion on version of Salt that is 2015.8.2 or newer, you also need to set ``add_proxymodule_to_opts: False`` in your proxy config file. The need to specify this configuration will be removed with - Salt ``Boron``, the next major feature release. See the `New in 2015.8.2`_ + Salt ``2016.3.0``, the next major feature release. See the `New in 2015.8.2`_ section of the Proxy Minion documentation for more information. .. _New in 2015.8.2: https://docs.saltstack.com/en/latest/topics/proxyminion/index.html#new-in-2015-8-2 diff --git a/salt/beacons/adb.py b/salt/beacons/adb.py index b95fab4f16..fbe5d554e9 100644 --- a/salt/beacons/adb.py +++ b/salt/beacons/adb.py @@ -2,7 +2,7 @@ ''' Beacon to emit adb device state changes for Android devices -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' # Import Python libs diff --git a/salt/beacons/glxinfo.py b/salt/beacons/glxinfo.py index 5ef764a3f5..0154e45624 100644 --- a/salt/beacons/glxinfo.py +++ b/salt/beacons/glxinfo.py @@ -2,7 +2,7 @@ ''' Beacon to emit when a display is available to a linux machine -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' # Import Python libs diff --git a/salt/beacons/memusage.py b/salt/beacons/memusage.py index 872da2c2a1..de1d89540c 100644 --- a/salt/beacons/memusage.py +++ b/salt/beacons/memusage.py @@ -2,7 +2,7 @@ ''' Beacon to monitor memory usage. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :depends: python-psutil ''' diff --git a/salt/beacons/pkg.py b/salt/beacons/pkg.py index b8deedf89e..0b7bbee030 100644 --- a/salt/beacons/pkg.py +++ b/salt/beacons/pkg.py @@ -2,7 +2,7 @@ ''' Watch for pkgs that have upgrades, then fire an event. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' # Import python libs diff --git a/salt/client/mixins.py b/salt/client/mixins.py index 5adfdd28dd..8bcc797498 100644 --- a/salt/client/mixins.py +++ b/salt/client/mixins.py @@ -329,7 +329,7 @@ class SyncClientMixin(object): # kwargs using the old mechanism if kwargs: salt.utils.warn_until( - 'Boron', + 'Carbon', 'kwargs must be passed inside the low under "kwargs"' ) else: diff --git a/salt/client/ssh/wrapper/state.py b/salt/client/ssh/wrapper/state.py index 98c7d04e00..dd6d5915dd 100644 --- a/salt/client/ssh/wrapper/state.py +++ b/salt/client/ssh/wrapper/state.py @@ -51,9 +51,9 @@ def sls(mods, saltenv='base', test=None, exclude=None, env=None, **kwargs): __opts__['grains'] = __grains__ if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -484,9 +484,9 @@ def show_sls(mods, saltenv='base', test=None, env=None, **kwargs): __opts__['grains'] = __grains__ if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/cloud/clouds/digital_ocean.py b/salt/cloud/clouds/digital_ocean.py index 4a69b9db14..cbaf39df33 100644 --- a/salt/cloud/clouds/digital_ocean.py +++ b/salt/cloud/clouds/digital_ocean.py @@ -937,7 +937,7 @@ def list_floating_ips(call=None): ''' Return a list of the floating ips that are on the provider - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Examples: @@ -977,7 +977,7 @@ def show_floating_ip(kwargs=None, call=None): ''' Show the details of a floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Examples: @@ -1010,7 +1010,7 @@ def create_floating_ip(kwargs=None, call=None): ''' Create a new floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Examples: @@ -1052,7 +1052,7 @@ def delete_floating_ip(kwargs=None, call=None): ''' Delete a floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Examples: @@ -1087,7 +1087,7 @@ def assign_floating_ip(kwargs=None, call=None): ''' Assign a floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Examples: @@ -1120,7 +1120,7 @@ def unassign_floating_ip(kwargs=None, call=None): ''' Unassign a floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Examples: diff --git a/salt/cloud/clouds/linode.py b/salt/cloud/clouds/linode.py index e762925355..82289a56ae 100644 --- a/salt/cloud/clouds/linode.py +++ b/salt/cloud/clouds/linode.py @@ -558,7 +558,7 @@ def create_config(kwargs=None, call=None): data_disk_id The Data Disk ID to be used for this config. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 kernel_id The ID of the kernel to use for this configuration profile. @@ -679,7 +679,7 @@ def create_data_disk(vm_=None, linode_id=None, data_size=None): r''' Create a data disk for the linode (type is hardcoded to ext4 at the moment) - .. versionadded:: Boron + .. versionadded:: 2016.3.0 vm\_ The VM profile to create the data disk for. @@ -834,7 +834,7 @@ def get_data_disk_size(vm_, swap, linode_id): ''' Return the size of of the data disk in MB - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' disk_size = get_linode(kwargs={'linode_id': linode_id})['TOTALHD'] root_disk_size = config.get_cloud_config_value( @@ -1044,7 +1044,7 @@ def get_data_disk(vm_): ''' Return True if a data disk is requested - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' return config.get_cloud_config_value( 'allocate_data_disk', vm_, __opts__, default=False diff --git a/salt/cloud/clouds/nova.py b/salt/cloud/clouds/nova.py index 8ac144c0b7..b48f54a3b8 100644 --- a/salt/cloud/clouds/nova.py +++ b/salt/cloud/clouds/nova.py @@ -1172,7 +1172,7 @@ def floating_ip_pool_list(call=None): ''' List all floating IP pools - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if call != 'function': raise SaltCloudSystemExit( @@ -1187,7 +1187,7 @@ def floating_ip_list(call=None): ''' List floating IPs - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if call != 'function': raise SaltCloudSystemExit( @@ -1202,7 +1202,7 @@ def floating_ip_create(kwargs, call=None): ''' Allocate a floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if call != 'function': raise SaltCloudSystemExit( @@ -1221,7 +1221,7 @@ def floating_ip_delete(kwargs, call=None): ''' De-allocate floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if call != 'function': raise SaltCloudSystemExit( @@ -1240,7 +1240,7 @@ def floating_ip_associate(name, kwargs, call=None): ''' Associate a floating IP address to a server - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if call != 'action': raise SaltCloudSystemExit( @@ -1260,7 +1260,7 @@ def floating_ip_disassociate(name, kwargs, call=None): ''' Disassociate a floating IP from a server - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if call != 'action': raise SaltCloudSystemExit( diff --git a/salt/cloud/clouds/opennebula.py b/salt/cloud/clouds/opennebula.py index 028b75ceca..0901405044 100644 --- a/salt/cloud/clouds/opennebula.py +++ b/salt/cloud/clouds/opennebula.py @@ -197,7 +197,7 @@ def list_clusters(call=None): ''' Returns a list of clusters in OpenNebula. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -225,7 +225,7 @@ def list_datastores(call=None): ''' Returns a list of data stores on OpenNebula. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -253,7 +253,7 @@ def list_hosts(call=None): ''' Returns a list of hosts on OpenNebula. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -331,7 +331,7 @@ def list_security_groups(call=None): ''' Lists all security groups available to the user and the user's groups. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -359,7 +359,7 @@ def list_templates(call=None): ''' Lists all templates available to the user and the user's groups. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -387,7 +387,7 @@ def list_vns(call=None): ''' Lists all virtual networks available to the user and the user's groups. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -415,7 +415,7 @@ def reboot(name, call=None): ''' Reboot a VM. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM to reboot. @@ -440,7 +440,7 @@ def start(name, call=None): ''' Start a VM. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM to start. @@ -465,7 +465,7 @@ def stop(name, call=None): ''' Stop a VM. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM to stop. @@ -490,7 +490,7 @@ def get_cluster_id(kwargs=None, call=None): ''' Returns a cluster's ID from the given cluster name. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -526,7 +526,7 @@ def get_datastore_id(kwargs=None, call=None): ''' Returns a data store's ID from the given data store name. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -562,7 +562,7 @@ def get_host_id(kwargs=None, call=None): ''' Returns a host's ID from the given host name. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -617,7 +617,7 @@ def get_image_id(kwargs=None, call=None): ''' Returns an image's ID from the given image name. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -679,7 +679,7 @@ def get_secgroup_id(kwargs=None, call=None): ''' Returns a security group's ID from the given security group name. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -715,7 +715,7 @@ def get_template_id(kwargs=None, call=None): ''' Returns a template's ID from the given template name. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -751,7 +751,7 @@ def get_vm_id(kwargs=None, call=None): ''' Returns a virtual machine's ID from the given virtual machine's name. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -787,7 +787,7 @@ def get_vn_id(kwargs=None, call=None): ''' Returns a virtual network's ID from the given virtual network's name. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1048,7 +1048,7 @@ def image_allocate(call=None, kwargs=None): ''' Allocates a new image in OpenNebula. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 path The path to a file containing the template of the image to allocate. @@ -1135,7 +1135,7 @@ def image_clone(call=None, kwargs=None): ''' Clones an existing image. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the new image. @@ -1204,7 +1204,7 @@ def image_delete(call=None, kwargs=None): Deletes the given image from OpenNebula. Either a name or an image_id must be supplied. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the image to delete. Can be used instead of ``image_id``. @@ -1263,7 +1263,7 @@ def image_info(call=None, kwargs=None): Retrieves information for a given image. Either a name or an image_id must be supplied. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the image for which to gather information. Can be used instead @@ -1320,7 +1320,7 @@ def image_persistent(call=None, kwargs=None): ''' Sets the Image as persistent or not persistent. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the image to set. Can be used instead of ``image_id``. @@ -1389,7 +1389,7 @@ def image_snapshot_delete(call=None, kwargs=None): ''' Deletes a snapshot from the image. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 image_id The ID of the image from which to delete the snapshot. Can be used instead of @@ -1458,7 +1458,7 @@ def image_snapshot_revert(call=None, kwargs=None): ''' Reverts an image state to a previous snapshot. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 image_id The ID of the image to revert. Can be used instead of ``image_name``. @@ -1525,7 +1525,7 @@ def image_snapshot_flatten(call=None, kwargs=None): ''' Flattens the snapshot of an image and discards others. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 image_id The ID of the image. Can be used instead of ``image_name``. @@ -1593,7 +1593,7 @@ def image_update(call=None, kwargs=None): ''' Replaces the image template contents. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 image_id The ID of the image to update. Can be used instead of ``image_name``. @@ -1729,7 +1729,7 @@ def secgroup_allocate(call=None, kwargs=None): ''' Allocates a new security group in OpenNebula. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 path The path to a file containing the template of the security group. Syntax @@ -1792,7 +1792,7 @@ def secgroup_clone(call=None, kwargs=None): ''' Clones an existing security group. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the new template. @@ -1863,7 +1863,7 @@ def secgroup_delete(call=None, kwargs=None): Deletes the given security group from OpenNebula. Either a name or a secgroup_id must be supplied. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the security group to delete. Can be used instead of @@ -1923,7 +1923,7 @@ def secgroup_info(call=None, kwargs=None): Retrieves information for the given security group. Either a name or a secgroup_id must be supplied. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the security group for which to gather information. Can be @@ -1980,7 +1980,7 @@ def secgroup_update(call=None, kwargs=None): ''' Replaces the security group template contents. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 secgroup_id The ID of the security group to update. Can be used instead of @@ -2091,7 +2091,7 @@ def template_allocate(call=None, kwargs=None): ''' Allocates a new template in OpenNebula. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 path The path to a file containing the elements of the template to be allocated. @@ -2156,7 +2156,7 @@ def template_clone(call=None, kwargs=None): ''' Clones an existing virtual machine template. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the new template. @@ -2226,7 +2226,7 @@ def template_delete(call=None, kwargs=None): Deletes the given template from OpenNebula. Either a name or a template_id must be supplied. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the template to delete. Can be used instead of ``template_id``. @@ -2284,7 +2284,7 @@ def template_instantiate(call=None, kwargs=None): ''' Instantiates a new virtual machine from a template. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. note:: ``template_instantiate`` creates a VM on OpenNebula from a template, but it @@ -2359,7 +2359,7 @@ def template_update(call=None, kwargs=None): ''' Replaces the template contents. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 template_id The ID of the template to update. Can be used instead of ``template_name``. @@ -2470,7 +2470,7 @@ def vm_action(name, kwargs=None, call=None): ''' Submits an action to be performed on a given virtual machine. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM to action. @@ -2535,7 +2535,7 @@ def vm_allocate(call=None, kwargs=None): ''' Allocates a new virtual machine in OpenNebula. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 path The path to a file defining the template of the VM to allocate. @@ -2602,7 +2602,7 @@ def vm_attach(name, kwargs=None, call=None): ''' Attaches a new disk to the given virtual machine. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM for which to attach the new disk. @@ -2668,7 +2668,7 @@ def vm_attach_nic(name, kwargs=None, call=None): ''' Attaches a new network interface to the given virtual machine. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM for which to attach the new network interface. @@ -2734,7 +2734,7 @@ def vm_deploy(name, kwargs=None, call=None): ''' Initiates the instance of the given VM on the target host. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM to deploy. @@ -2833,7 +2833,7 @@ def vm_detach(name, kwargs=None, call=None): ''' Detaches a disk from a virtual machine. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM from which to detach the disk. @@ -2880,7 +2880,7 @@ def vm_detach_nic(name, kwargs=None, call=None): ''' Detaches a disk from a virtual machine. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM from which to detach the network interface. @@ -2927,7 +2927,7 @@ def vm_disk_save(name, kwargs=None, call=None): ''' Sets the disk to be saved in the given image. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM containing the disk to save. @@ -2997,7 +2997,7 @@ def vm_disk_snapshot_create(name, kwargs=None, call=None): ''' Takes a new snapshot of the disk image. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM of which to take the snapshot. @@ -3053,7 +3053,7 @@ def vm_disk_snapshot_delete(name, kwargs=None, call=None): ''' Deletes a disk snapshot based on the given VM and the disk_id. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM containing the snapshot to delete. @@ -3109,7 +3109,7 @@ def vm_disk_snapshot_revert(name, kwargs=None, call=None): ''' Reverts a disk state to a previously taken snapshot. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM containing the snapshot. @@ -3165,7 +3165,7 @@ def vm_info(name, call=None): ''' Retrieves information for a given virtual machine. A VM name must be supplied. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM for which to gather information. @@ -3199,7 +3199,7 @@ def vm_migrate(name, kwargs=None, call=None): ''' Migrates the specified virtual machine to the specified target host. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM to migrate. @@ -3308,7 +3308,7 @@ def vm_monitoring(name, call=None): contains the complete dictionary of the VM with the updated information returned by the poll action. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM for which to gather monitoring records. @@ -3346,7 +3346,7 @@ def vm_resize(name, kwargs=None, call=None): ''' Changes the capacity of the virtual machine. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM to resize. @@ -3420,7 +3420,7 @@ def vm_snapshot_create(vm_name, kwargs=None, call=None): ''' Creates a new virtual machine snapshot from the provided VM. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 vm_name The name of the VM from which to create the snapshot. @@ -3467,7 +3467,7 @@ def vm_snapshot_delete(vm_name, kwargs=None, call=None): ''' Deletes a virtual machine snapshot from the provided VM. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 vm_name The name of the VM from which to delete the snapshot. @@ -3514,7 +3514,7 @@ def vm_snapshot_revert(vm_name, kwargs=None, call=None): ''' Reverts a virtual machine to a snapshot - .. versionadded:: Boron + .. versionadded:: 2016.3.0 vm_name The name of the VM to revert. @@ -3561,7 +3561,7 @@ def vm_update(name, kwargs=None, call=None): ''' Replaces the user template contents. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the VM to update. @@ -3647,7 +3647,7 @@ def vn_add_ar(call=None, kwargs=None): ''' Adds address ranges to a given virtual network. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 vn_id The ID of the virtual network to add the address range. Can be used @@ -3733,7 +3733,7 @@ def vn_allocate(call=None, kwargs=None): ''' Allocates a new virtual network in OpenNebula. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 path The path to a file containing the template of the virtual network to allocate. @@ -3817,7 +3817,7 @@ def vn_delete(call=None, kwargs=None): Deletes the given virtual network from OpenNebula. Either a name or a vn_id must be supplied. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the virtual network to delete. Can be used instead of ``vn_id``. @@ -3875,7 +3875,7 @@ def vn_free_ar(call=None, kwargs=None): ''' Frees a reserved address range from a virtual network. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 vn_id The ID of the virtual network from which to free an address range. @@ -3944,7 +3944,7 @@ def vn_hold(call=None, kwargs=None): ''' Holds a virtual network lease as used. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 vn_id The ID of the virtual network from which to hold the lease. Can be used @@ -4029,7 +4029,7 @@ def vn_info(call=None, kwargs=None): ''' Retrieves information for the virtual network. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The name of the virtual network for which to gather information. Can be @@ -4088,7 +4088,7 @@ def vn_release(call=None, kwargs=None): ''' Releases a virtual network lease that was previously on hold. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 vn_id The ID of the virtual network from which to release the lease. Can be @@ -4173,7 +4173,7 @@ def vn_reserve(call=None, kwargs=None): ''' Reserve network addresses. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 vn_id The ID of the virtual network from which to reserve addresses. Can be used diff --git a/salt/cloud/clouds/softlayer_hw.py b/salt/cloud/clouds/softlayer_hw.py index 661ea85e47..614e31a1aa 100644 --- a/salt/cloud/clouds/softlayer_hw.py +++ b/salt/cloud/clouds/softlayer_hw.py @@ -657,7 +657,7 @@ def show_all_categories(call=None): ''' Return a dict of all available categories on the cloud provider. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if call == 'action': raise SaltCloudSystemExit( diff --git a/salt/cloud/clouds/vmware.py b/salt/cloud/clouds/vmware.py index 928dfc6f39..d5cfb71108 100644 --- a/salt/cloud/clouds/vmware.py +++ b/salt/cloud/clouds/vmware.py @@ -475,7 +475,7 @@ def _add_new_ide_controller_helper(ide_controller_label, properties, bus_number) ''' Helper function for adding new IDE controllers - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' random_key = randint(-200, -250) diff --git a/salt/cloud/clouds/vultrpy.py b/salt/cloud/clouds/vultrpy.py index ea1edc443b..cb544879aa 100644 --- a/salt/cloud/clouds/vultrpy.py +++ b/salt/cloud/clouds/vultrpy.py @@ -3,7 +3,7 @@ Vultr Cloud Module using python-vultr bindings ============================================== -.. versionadded:: Boron +.. versionadded:: 2016.3.0 The Vultr cloud module is used to control access to the Vultr VPS system. diff --git a/salt/config/__init__.py b/salt/config/__init__.py index 06c35e9a79..eb68aa8a25 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -451,7 +451,7 @@ VALID_OPTS = { # Add the proxymodule LazyLoader object to opts. This breaks many things # but this was the default pre 2015.8.2. This should default to - # False in Boron + # False in 2016.3.0 'add_proxymodule_to_opts': bool, 'git_pillar_base': str, 'git_pillar_branch': str, diff --git a/salt/engines/logentries.py b/salt/engines/logentries.py index f6264ab4c0..0fe422edfe 100644 --- a/salt/engines/logentries.py +++ b/salt/engines/logentries.py @@ -7,7 +7,7 @@ An engine that sends events to the Logentries logging service. :depends: ssl, certifi :platform: all -.. versionadded: Boron +.. versionadded: 2016.3.0 To enable this engine the master and/or minion will need the following python libraries diff --git a/salt/engines/redis_sentinel.py b/salt/engines/redis_sentinel.py index 0a445f70ed..8f4e807313 100644 --- a/salt/engines/redis_sentinel.py +++ b/salt/engines/redis_sentinel.py @@ -3,7 +3,7 @@ An engine that reads messages from the redis sentinel pubsub and sends reactor events based on the channels they are subscribed to. -.. versionadded: Boron +.. versionadded: 2016.3.0 :configuration: diff --git a/salt/engines/slack.py b/salt/engines/slack.py index ce22749870..37dab26e8f 100644 --- a/salt/engines/slack.py +++ b/salt/engines/slack.py @@ -5,7 +5,7 @@ event bus. Alternatively Salt commands can be sent to the Salt master via Slack by setting the control paramter to True and using command prefaced with a !. -.. versionadded: Boron +.. versionadded: 2016.3.0 :configuration: diff --git a/salt/fileclient.py b/salt/fileclient.py index 575ebd2b3b..766338bd12 100644 --- a/salt/fileclient.py +++ b/salt/fileclient.py @@ -112,10 +112,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -161,10 +161,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -178,10 +178,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -199,10 +199,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -219,10 +219,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -296,10 +296,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -317,10 +317,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -333,10 +333,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -349,10 +349,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -366,10 +366,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -470,10 +470,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -537,10 +537,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -720,10 +720,10 @@ class Client(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -825,10 +825,10 @@ class LocalClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -846,10 +846,10 @@ class LocalClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -874,10 +874,10 @@ class LocalClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -901,10 +901,10 @@ class LocalClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -928,10 +928,10 @@ class LocalClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -965,10 +965,10 @@ class LocalClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -1056,10 +1056,10 @@ class RemoteClient(Client): if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -1191,10 +1191,10 @@ class RemoteClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -1211,10 +1211,10 @@ class RemoteClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -1230,10 +1230,10 @@ class RemoteClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -1260,10 +1260,10 @@ class RemoteClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -1293,10 +1293,10 @@ class RemoteClient(Client): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/fileserver/__init__.py b/salt/fileserver/__init__.py index c40e512d94..abbd3a7f75 100644 --- a/salt/fileserver/__init__.py +++ b/salt/fileserver/__init__.py @@ -507,10 +507,10 @@ class Fileserver(object): kwargs[args[0]] = args[1] if 'env' in kwargs: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) saltenv = kwargs.pop('env') elif 'saltenv' in kwargs: @@ -535,10 +535,10 @@ class Fileserver(object): 'dest': ''} if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) load['saltenv'] = load.pop('env') @@ -561,10 +561,10 @@ class Fileserver(object): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) load['saltenv'] = load.pop('env') @@ -588,10 +588,10 @@ class Fileserver(object): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) load['saltenv'] = load.pop('env') @@ -619,10 +619,10 @@ class Fileserver(object): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) load['saltenv'] = load.pop('env') @@ -650,10 +650,10 @@ class Fileserver(object): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) load['saltenv'] = load.pop('env') @@ -681,10 +681,10 @@ class Fileserver(object): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) load['saltenv'] = load.pop('env') diff --git a/salt/fileserver/azurefs.py b/salt/fileserver/azurefs.py index c4041d2e8a..ae377dd9fd 100644 --- a/salt/fileserver/azurefs.py +++ b/salt/fileserver/azurefs.py @@ -75,9 +75,9 @@ def find_file(path, saltenv='base', env=None, **kwargs): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -115,9 +115,9 @@ def serve_file(load, fnd): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') diff --git a/salt/fileserver/hgfs.py b/salt/fileserver/hgfs.py index 2a395e3be1..96c9133e3d 100644 --- a/salt/fileserver/hgfs.py +++ b/salt/fileserver/hgfs.py @@ -699,9 +699,9 @@ def serve_file(load, fnd): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -729,9 +729,9 @@ def file_hash(load, fnd): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -762,9 +762,9 @@ def _file_lists(load, form): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -809,9 +809,9 @@ def _get_file_list(load): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -853,9 +853,9 @@ def _get_dir_list(load): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') diff --git a/salt/fileserver/minionfs.py b/salt/fileserver/minionfs.py index 69274c7377..0149ee98fe 100644 --- a/salt/fileserver/minionfs.py +++ b/salt/fileserver/minionfs.py @@ -156,9 +156,9 @@ def file_hash(load, fnd): ret = {} if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -225,9 +225,9 @@ def file_list(load): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -308,9 +308,9 @@ def dir_list(load): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') diff --git a/salt/fileserver/roots.py b/salt/fileserver/roots.py index c3b9a004c1..1e7ae70870 100644 --- a/salt/fileserver/roots.py +++ b/salt/fileserver/roots.py @@ -37,9 +37,9 @@ def find_file(path, saltenv='base', env=None, **kwargs): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -89,9 +89,9 @@ def serve_file(load, fnd): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -176,9 +176,9 @@ def file_hash(load, fnd): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -255,9 +255,9 @@ def _file_lists(load, form): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') if load['saltenv'] not in __opts__['file_roots']: @@ -351,9 +351,9 @@ def symlink_list(load): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') diff --git a/salt/fileserver/s3fs.py b/salt/fileserver/s3fs.py index 622e1ebb7b..ed544ac2f8 100644 --- a/salt/fileserver/s3fs.py +++ b/salt/fileserver/s3fs.py @@ -125,9 +125,9 @@ def find_file(path, saltenv='base', env=None, **kwargs): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -167,9 +167,9 @@ def file_hash(load, fnd): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -199,9 +199,9 @@ def serve_file(load, fnd): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -240,9 +240,9 @@ def file_list(load): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -280,9 +280,9 @@ def dir_list(load): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') diff --git a/salt/fileserver/svnfs.py b/salt/fileserver/svnfs.py index 4685c1c38e..c5f0f136b1 100644 --- a/salt/fileserver/svnfs.py +++ b/salt/fileserver/svnfs.py @@ -593,9 +593,9 @@ def serve_file(load, fnd): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -623,9 +623,9 @@ def file_hash(load, fnd): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -680,9 +680,9 @@ def _file_lists(load, form): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') diff --git a/salt/grains/core.py b/salt/grains/core.py index 46a743d91c..f22c304be0 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py @@ -1706,7 +1706,7 @@ def dns(): ''' Parse the resolver configuration file - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if salt.utils.is_windows() or 'proxyminion' in __opts__: diff --git a/salt/minion.py b/salt/minion.py index 5dc78b824d..b2a0f70cbc 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -266,10 +266,10 @@ def parse_args_and_kwargs(func, args, data=None): Wrap load_args_and_kwargs ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'salt.minion.parse_args_and_kwargs() has been renamed to ' 'salt.minion.load_args_and_kwargs(). Please change this function call ' - 'before the Boron release of Salt.' + 'before the Carbon release of Salt.' ) return load_args_and_kwargs(func, args, data=data) @@ -294,7 +294,7 @@ def load_args_and_kwargs(func, args, data=None, ignore_invalid=False): _args.append(arg) elif string_kwarg: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The list of function args and kwargs should be parsed ' 'by salt.utils.args.parse_input() before calling ' 'salt.minion.load_args_and_kwargs().' @@ -2770,7 +2770,7 @@ class ProxyMinion(Minion): # functions here, and then force a grains sync in modules_refresh self.opts['grains'] = salt.loader.grains(self.opts, force_refresh=True) - # Check config 'add_proxymodule_to_opts' Remove this in Boron. + # Check config 'add_proxymodule_to_opts' Remove this in Carbon. if self.opts['add_proxymodule_to_opts']: self.opts['proxymodule'] = self.proxy diff --git a/salt/modules/augeas_cfg.py b/salt/modules/augeas_cfg.py index 187dfe0165..6b1f1e7b1b 100644 --- a/salt/modules/augeas_cfg.py +++ b/salt/modules/augeas_cfg.py @@ -144,7 +144,7 @@ def execute(context=None, lens=None, commands=(), load_path=None): commands The Augeas commands to execute - .. versionadded:: Boron + .. versionadded:: 2016.3.0 load_path A colon-spearated list of directories that modules should be searched @@ -274,7 +274,7 @@ def get(path, value='', load_path=None): value The optional value to get - .. versionadded:: Boron + .. versionadded:: 2016.3.0 load_path A colon-spearated list of directories that modules should be searched @@ -404,7 +404,7 @@ def match(path, value='', load_path=None): value The value to match on - .. versionadded:: Boron + .. versionadded:: 2016.3.0 load_path A colon-spearated list of directories that modules should be searched @@ -443,7 +443,7 @@ def remove(path, load_path=None): path The path to remove - .. versionadded:: Boron + .. versionadded:: 2016.3.0 load_path A colon-spearated list of directories that modules should be searched @@ -482,7 +482,7 @@ def ls(path, load_path=None): # pylint: disable=C0103 path The path to list - .. versionadded:: Boron + .. versionadded:: 2016.3.0 load_path A colon-spearated list of directories that modules should be searched @@ -533,7 +533,7 @@ def tree(path, load_path=None): path The base of the recursive listing - .. versionadded:: Boron + .. versionadded:: 2016.3.0 load_path A colon-spearated list of directories that modules should be searched diff --git a/salt/modules/bcache.py b/salt/modules/bcache.py index b4d3b8eee3..f7d7cdff57 100644 --- a/salt/modules/bcache.py +++ b/salt/modules/bcache.py @@ -12,7 +12,7 @@ https://www.kernel.org/doc/Documentation/bcache.txt This module needs the bcache userspace tools to function. -.. versionadded: Boron +.. versionadded: 2016.3.0 ''' # Import python libs diff --git a/salt/modules/blockdev.py b/salt/modules/blockdev.py index 9616dfc13f..f873a34e2f 100644 --- a/salt/modules/blockdev.py +++ b/salt/modules/blockdev.py @@ -3,7 +3,7 @@ Module for managing block devices .. versionadded:: 2014.7.0 -.. deprecated:: Boron +.. deprecated:: Carbon Merged to `disk` module ''' @@ -42,7 +42,7 @@ def tune(device, **kwargs): ''' Set attributes for the specified device - .. deprecated:: Boron + .. deprecated:: Carbon Use `disk.tune` CLI Example: @@ -69,7 +69,7 @@ def wipe(device): ''' Remove the filesystem information - .. deprecated:: Boron + .. deprecated:: Carbon Use `disk.tune` CLI Example: @@ -89,7 +89,7 @@ def dump(device, args=None): ''' Return all contents of dumpe2fs for a specified device - .. deprecated:: Boron + .. deprecated:: Carbon Use `disk.dump` args @@ -200,7 +200,7 @@ def resize2fs(device): ''' Resizes the filesystem. - .. deprecated:: Boron + .. deprecated:: Carbon Use `disk.resize2fs` CLI Example: diff --git a/salt/modules/boto_cloudtrail.py b/salt/modules/boto_cloudtrail.py index 0ceae80c53..f81e76d85a 100644 --- a/salt/modules/boto_cloudtrail.py +++ b/salt/modules/boto_cloudtrail.py @@ -2,7 +2,7 @@ ''' Connection module for Amazon CloudTrail -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :configuration: This module accepts explicit Lambda credentials but can also utilize IAM roles assigned to the instance trough Instance Profiles. diff --git a/salt/modules/boto_datapipeline.py b/salt/modules/boto_datapipeline.py index dd2693960e..579865f03b 100644 --- a/salt/modules/boto_datapipeline.py +++ b/salt/modules/boto_datapipeline.py @@ -2,7 +2,7 @@ ''' Connection module for Amazon Data Pipeline -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :depends: boto3 ''' diff --git a/salt/modules/boto_ec2.py b/salt/modules/boto_ec2.py index 16fbf23dc8..14586ecfbf 100644 --- a/salt/modules/boto_ec2.py +++ b/salt/modules/boto_ec2.py @@ -138,7 +138,7 @@ def get_all_eip_addresses(addresses=None, allocation_ids=None, region=None, salt-call boto_ec2.get_all_eip_addresses - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' return [x.public_ip for x in _get_all_eip_addresses(addresses, allocation_ids, region, key, keyid, profile)] @@ -159,7 +159,7 @@ def get_unassociated_eip_address(domain='standard', region=None, key=None, salt-call boto_ec2.get_unassociated_eip_address - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' eip = None for address in get_all_eip_addresses(region=region, key=key, keyid=keyid, @@ -210,7 +210,7 @@ def get_eip_address_info(addresses=None, allocation_ids=None, region=None, key=N salt-call boto_ec2.get_eip_address_info addresses=52.4.2.15 - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if type(addresses) == (type('string')): addresses = [addresses] @@ -247,7 +247,7 @@ def allocate_eip_address(domain=None, region=None, key=None, keyid=None, profile salt-call boto_ec2.allocate_eip_address domain=vpc - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if domain and domain != 'vpc': raise SaltInvocationError('The only permitted value for the \'domain\' param is \'vpc\'.') @@ -287,7 +287,7 @@ def release_eip_address(public_ip=None, allocation_id=None, region=None, key=Non salt myminion boto_ec2.release_eip_address allocation_id=eipalloc-ef382c8a - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if not salt.utils.exactly_one((public_ip, allocation_id)): raise SaltInvocationError('Exactly one (but not both) of \'public_ip\' ' @@ -338,7 +338,7 @@ def associate_eip_address(instance_id=None, instance_name=None, public_ip=None, salt myminion boto_ec2.associate_eip_address instance_name=bubba.ho.tep allocation_id=eipalloc-ef382c8a - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if not salt.utils.exactly_one((instance_id, instance_name, network_interface_id, @@ -404,7 +404,7 @@ def disassociate_eip_address(public_ip=None, association_id=None, region=None, salt myminion boto_ec2.disassociate_eip_address association_id=eipassoc-e3ba2d16 - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) @@ -1087,7 +1087,7 @@ def get_network_interface_id(name, region=None, key=None, keyid=None, ''' Get an Elastic Network Interface id from its name tag. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1116,7 +1116,7 @@ def get_network_interface(name=None, network_interface_id=None, region=None, ''' Get an Elastic Network Interface. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1196,7 +1196,7 @@ def create_network_interface(name, subnet_id=None, subnet_name=None, ''' Create an Elastic Network Interface. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1258,7 +1258,7 @@ def delete_network_interface( ''' Create an Elastic Network Interface. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1295,7 +1295,7 @@ def attach_network_interface(device_index, name=None, network_interface_id=None, ''' Attach an Elastic Network Interface. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1351,7 +1351,7 @@ def detach_network_interface( ''' Detach an Elastic Network Interface. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1390,7 +1390,7 @@ def modify_network_interface_attribute( ''' Modify an attribute of an Elastic Network Interface. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/boto_elb.py b/salt/modules/boto_elb.py index c83dd7fa2a..84a8cb7ad5 100644 --- a/salt/modules/boto_elb.py +++ b/salt/modules/boto_elb.py @@ -750,7 +750,7 @@ def create_policy(name, policy_name, policy_type, policy, region=None, ''' Create an ELB policy. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI example: @@ -783,7 +783,7 @@ def delete_policy(name, policy_name, region=None, key=None, keyid=None, ''' Delete an ELB policy. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI example: @@ -811,7 +811,7 @@ def set_listener_policy(name, port, policies=None, region=None, key=None, ''' Set the policies of an ELB listener. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI example: @@ -864,7 +864,7 @@ def set_tags(name, tags, region=None, key=None, keyid=None, profile=None): ''' Add the tags on an ELB - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name name of the ELB diff --git a/salt/modules/boto_iam.py b/salt/modules/boto_iam.py index af9545a7fa..af157c84e7 100644 --- a/salt/modules/boto_iam.py +++ b/salt/modules/boto_iam.py @@ -411,7 +411,7 @@ def get_group_members(group_name, region=None, key=None, keyid=None, profile=Non ''' Get group information. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -697,7 +697,7 @@ def delete_login_profile(user_name, region=None, key=None, keyid=None, ''' Deletes a login profile for the specified user. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -730,7 +730,7 @@ def get_all_mfa_devices(user_name, region=None, key=None, keyid=None, ''' Get all MFA devices associated with an IAM user. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -764,7 +764,7 @@ def deactivate_mfa_device(user_name, serial, region=None, key=None, keyid=None, Deactivates the specified MFA device and removes it from association with the user. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1447,7 +1447,7 @@ def export_users(path_prefix='/', region=None, key=None, keyid=None, Get all IAM user details. Produces results that can be used to create an sls file. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/boto_iot.py b/salt/modules/boto_iot.py index 57a768cc54..203c91674a 100644 --- a/salt/modules/boto_iot.py +++ b/salt/modules/boto_iot.py @@ -2,7 +2,7 @@ ''' Connection module for Amazon IoT -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :configuration: This module accepts explicit Lambda credentials but can also utilize IAM roles assigned to the instance trough Instance Profiles. diff --git a/salt/modules/boto_lambda.py b/salt/modules/boto_lambda.py index a2e729f23f..4edd34133e 100644 --- a/salt/modules/boto_lambda.py +++ b/salt/modules/boto_lambda.py @@ -2,7 +2,7 @@ ''' Connection module for Amazon Lambda -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :configuration: This module accepts explicit Lambda credentials but can also utilize IAM roles assigned to the instance trough Instance Profiles. diff --git a/salt/modules/boto_s3_bucket.py b/salt/modules/boto_s3_bucket.py index cf2bf45f44..90032deb21 100644 --- a/salt/modules/boto_s3_bucket.py +++ b/salt/modules/boto_s3_bucket.py @@ -2,7 +2,7 @@ ''' Connection module for Amazon S3 Buckets -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :configuration: This module accepts explicit Lambda credentials but can also utilize IAM roles assigned to the instance trough Instance Profiles. diff --git a/salt/modules/boto_secgroup.py b/salt/modules/boto_secgroup.py index df2af94b35..4c96378d85 100644 --- a/salt/modules/boto_secgroup.py +++ b/salt/modules/boto_secgroup.py @@ -540,7 +540,7 @@ def set_tags(tags, ''' sets tags on a security group - .. versionadded:: Boron + .. versionadded:: 2016.3.0 tags a dict of key:value pair of tags to set on the security group @@ -604,7 +604,7 @@ def delete_tags(tags, ''' deletes tags from a security group - .. versionadded:: Boron + .. versionadded:: 2016.3.0 tags a list of tags to remove diff --git a/salt/modules/boto_vpc.py b/salt/modules/boto_vpc.py index a37d96cfd2..2f02b01b5a 100644 --- a/salt/modules/boto_vpc.py +++ b/salt/modules/boto_vpc.py @@ -139,7 +139,7 @@ def check_vpc(vpc_id=None, vpc_name=None, region=None, key=None, both vpc_id and vpc_name are None. Optionally raise a CommandExecutionError if the VPC does not exist. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1238,7 +1238,7 @@ def get_dhcp_options(dhcp_options_name=None, dhcp_options_id=None, salt myminion boto_vpc.get_dhcp_options 'myfunnydhcpoptionsname' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if not any((dhcp_options_name, dhcp_options_id)): raise SaltInvocationError('At least one of the following must be specified: ' @@ -1323,12 +1323,12 @@ def associate_new_dhcp_options_to_vpc(vpc_id, domain_name=None, domain_name_serv netbios_name_servers=None, netbios_node_type=None, region=None, key=None, keyid=None, profile=None): ''' - ..deprecated:: Boron + ..deprecated:: Carbon This function has been deprecated in favor of :py:func:`boto_vpc.create_dhcp_options `, which now takes vpc_id or vpc_name as kwargs. - This function will be removed in the Salt Boron release. + This function will be removed in the Salt Carbon release. Given valid DHCP options and a valid VPC id, create and associate the DHCP options record with the VPC. @@ -1340,9 +1340,9 @@ def associate_new_dhcp_options_to_vpc(vpc_id, domain_name=None, domain_name_serv ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'Support for \'associate_new_dhcp_options_to_vpc\' has been deprecated ' - 'and will be removed in Salt Boron. Please use \'create_dhcp_options\' instead.' + 'and will be removed in Salt Carbon. Please use \'create_dhcp_options\' instead.' ) return create_dhcp_options(vpc_id=vpc_id, domain_name=domain_name, @@ -1553,12 +1553,12 @@ def associate_network_acl_to_subnet(network_acl_id=None, subnet_id=None, def associate_new_network_acl_to_subnet(vpc_id, subnet_id, network_acl_name=None, tags=None, region=None, key=None, keyid=None, profile=None): ''' - ..deprecated:: Boron + ..deprecated:: Carbon This function has been deprecated in favor of :py:func:`boto_vpc.create_network_acl `, which now takes subnet_id or subnet_name as kwargs. - This function will be removed in the Salt Boron release. + This function will be removed in the Salt Carbon release. Given a vpc ID and a subnet ID, associates a new network act to a subnet. @@ -1572,9 +1572,9 @@ def associate_new_network_acl_to_subnet(vpc_id, subnet_id, network_acl_name=None salt myminion boto_vpc.associate_new_network_acl_to_subnet 'vpc-6b1fe402' 'subnet-6a1fe403' ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'Support for \'associate_new_network_acl_to_subnet\' has been deprecated ' - 'and will be removed in Salt Boron. Please use \'create_network_acl\' instead.' + 'and will be removed in Salt Carbon. Please use \'create_network_acl\' instead.' ) return create_network_acl(vpc_id=vpc_id, subnet_id=subnet_id, diff --git a/salt/modules/cmdmod.py b/salt/modules/cmdmod.py index 4c1bf235c5..77ee09c787 100644 --- a/salt/modules/cmdmod.py +++ b/salt/modules/cmdmod.py @@ -697,7 +697,7 @@ def run(cmd, :param str password: Windows only. Pass a password if you specify runas. This parameter will be ignored for other OS's - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param str shell: Shell to execute under. Defaults to the system default shell. @@ -925,7 +925,7 @@ def shell(cmd, :param str password: Windows only. Pass a password if you specify runas. This parameter will be ignored for other OS's - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param int shell: Shell to execute under. Defaults to the system default shell. @@ -1109,7 +1109,7 @@ def run_stdout(cmd, :param str password: Windows only. Pass a password if you specify runas. This parameter will be ignored for other OS's - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param str shell: Shell to execute under. Defaults to the system default shell. @@ -1290,7 +1290,7 @@ def run_stderr(cmd, :param str password: Windows only. Pass a password if you specify runas. This parameter will be ignored for other OS's - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param str shell: Shell to execute under. Defaults to the system default shell. @@ -1473,7 +1473,7 @@ def run_all(cmd, :param str password: Windows only. Pass a password if you specify runas. This parameter will be ignored for other OS's - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param str shell: Shell to execute under. Defaults to the system default shell. @@ -1664,7 +1664,7 @@ def retcode(cmd, :param str password: Windows only. Pass a password if you specify runas. This parameter will be ignored for other OS's - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param str shell: Shell to execute under. Defaults to the system default shell. @@ -1898,7 +1898,7 @@ def script(source, :param str password: Windows only. Pass a password if you specify runas. This parameter will be ignored for other OS's - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param str shell: Shell to execute under. Defaults to the system default shell. @@ -2000,9 +2000,9 @@ def script(source, if isinstance(__env__, six.string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' not ' - '\'__env__\'. This functionality will be removed in Salt Boron.' + '\'__env__\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = __env__ @@ -2112,7 +2112,7 @@ def script_retcode(source, :param str password: Windows only. Pass a password if you specify runas. This parameter will be ignored for other OS's - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param str shell: Shell to execute under. Defaults to the system default shell. @@ -2595,7 +2595,7 @@ def powershell(cmd, ''' Execute the passed PowerShell command and return the output as a string. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. warning :: @@ -2621,7 +2621,7 @@ def powershell(cmd, :param str password: Windows only. Pass a password if you specify runas. This parameter will be ignored for other OS's - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param str shell: Shell to execute under. Defaults to the system default shell. @@ -2756,7 +2756,7 @@ def run_bg(cmd, saltenv='base', **kwargs): r''' - .. versionadded: Boron + .. versionadded: 2016.3.0 Execute the passed command in the background and return it's PID diff --git a/salt/modules/cp.py b/salt/modules/cp.py index 9a17c8533c..6a60a5deee 100644 --- a/salt/modules/cp.py +++ b/salt/modules/cp.py @@ -185,9 +185,9 @@ def get_file(path, ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -230,9 +230,9 @@ def get_template(path, ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -269,9 +269,9 @@ def get_dir(path, dest, saltenv='base', template=None, gzip=None, env=None, **kw ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -299,9 +299,9 @@ def get_url(path, dest, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -325,9 +325,9 @@ def get_file_str(path, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -351,9 +351,9 @@ def cache_file(path, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -388,9 +388,9 @@ def cache_files(paths, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -434,9 +434,9 @@ def cache_dir(path, saltenv='base', include_empty=False, include_pat=None, ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -459,9 +459,9 @@ def cache_master(saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -510,9 +510,9 @@ def list_states(saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -533,9 +533,9 @@ def list_master(saltenv='base', prefix='', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -556,9 +556,9 @@ def list_master_dirs(saltenv='base', prefix='', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -579,9 +579,9 @@ def list_master_symlinks(saltenv='base', prefix='', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -602,9 +602,9 @@ def list_minion(saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -626,9 +626,9 @@ def is_cached(path, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -651,9 +651,9 @@ def hash_file(path, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -686,7 +686,7 @@ def push(path, keep_symlinks=False, upload_path=None, remove_source=False): remove_source Remove the source file on the minion - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/data.py b/salt/modules/data.py index 7bbffa97c2..7263f1316e 100644 --- a/salt/modules/data.py +++ b/salt/modules/data.py @@ -106,7 +106,7 @@ def getval(key): ''' Get a value from the minion datastore - .. deprecated:: Boron + .. deprecated:: Carbon Use ``get`` instead CLI Example: @@ -116,9 +116,9 @@ def getval(key): salt '*' data.getval ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'Support for \'getval\' has been deprecated and will be removed ' - 'in Salt Boron. Please use \'get\' instead.' + 'in Salt Carbon. Please use \'get\' instead.' ) return get(key) @@ -127,7 +127,7 @@ def getvals(*keylist): ''' Get values from the minion datastore - .. deprecated:: Boron + .. deprecated:: Carbon Use ``get`` instead CLI Example: @@ -137,9 +137,9 @@ def getvals(*keylist): salt '*' data.getvals [ ...] ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'Support for \'getvals\' has been deprecated and will be removed ' - 'in Salt Boron. Please use \'get\' instead.' + 'in Salt Carbon. Please use \'get\' instead.' ) return get(keylist) diff --git a/salt/modules/deb_apache.py b/salt/modules/deb_apache.py index 8213f3ede2..191d8e4080 100644 --- a/salt/modules/deb_apache.py +++ b/salt/modules/deb_apache.py @@ -232,7 +232,7 @@ def a2dismod(mod): def check_conf_enabled(conf): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Checks to see if the specific conf symlink is in /etc/apache2/conf-enabled. @@ -256,7 +256,7 @@ def check_conf_enabled(conf): @salt.utils.decorators.which('a2enconf') def a2enconf(conf): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Runs a2enconf for the given conf. @@ -293,7 +293,7 @@ def a2enconf(conf): @salt.utils.decorators.which('a2disconf') def a2disconf(conf): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Runs a2disconf for the given conf. diff --git a/salt/modules/debconfmod.py b/salt/modules/debconfmod.py index 44e8625cef..897ec44f1b 100644 --- a/salt/modules/debconfmod.py +++ b/salt/modules/debconfmod.py @@ -184,9 +184,9 @@ def set_file(path, saltenv='base', **kwargs): ''' if '__env__' in kwargs: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' not ' - '\'__env__\'. This functionality will be removed in Salt Boron.' + '\'__env__\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = kwargs['__env__'] diff --git a/salt/modules/disk.py b/salt/modules/disk.py index 19d9c13631..7fb0348814 100644 --- a/salt/modules/disk.py +++ b/salt/modules/disk.py @@ -395,7 +395,7 @@ def hdparms(disks, args=None): parse 'em into a nice dict (which, considering hdparms output, is quite a hassle) - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: .. code-block:: bash @@ -479,7 +479,7 @@ def hpa(disks, size=None): .. warning:: Setting the HPA might clobber your data, be very careful with this on active disks! - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -531,7 +531,7 @@ def smart_attributes(dev, attributes=None, values=None): set (https://www.backblaze.com/blog/hard-drive-smart-stats/): (5,187,188,197,198) - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -599,7 +599,7 @@ def iostat(interval=1, count=5, disks=None): ''' Gather and return (averaged) IO stats. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py index ac6b5e0941..606d0f60c0 100644 --- a/salt/modules/dockercompose.py +++ b/salt/modules/dockercompose.py @@ -3,7 +3,7 @@ ''' Module to import docker-compose via saltstack -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :maintainer: Jean Praloran :maturity: new diff --git a/salt/modules/dockerio.py b/salt/modules/dockerio.py index 0d4d2a3262..013f81f17e 100644 --- a/salt/modules/dockerio.py +++ b/salt/modules/dockerio.py @@ -2173,10 +2173,10 @@ def _script(status, if isinstance(env, six.string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -2274,10 +2274,10 @@ def script(container, if isinstance(env, six.string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env @@ -2334,10 +2334,10 @@ def script_retcode(container, if isinstance(env, six.string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/modules/etcd_mod.py b/salt/modules/etcd_mod.py index f3c9ca4c44..caec5d5b29 100644 --- a/salt/modules/etcd_mod.py +++ b/salt/modules/etcd_mod.py @@ -103,7 +103,7 @@ def set_(key, value, profile=None, ttl=None, directory=False): def update(fields, path='', profile=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Sets a dictionary of values in one call. Useful for large updates in syndic environments. The dictionary can contain a mix of formats @@ -156,7 +156,7 @@ def update(fields, path='', profile=None): def watch(key, recurse=False, profile=None, timeout=0, index=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Makes a best effort to watch for a key or tree change in etcd. Returns a dict containing the new key value ( or None if the key was diff --git a/salt/modules/ethtool.py b/salt/modules/ethtool.py index fc288127bc..9f28db3670 100644 --- a/salt/modules/ethtool.py +++ b/salt/modules/ethtool.py @@ -2,7 +2,7 @@ ''' Module for running ethtool command -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :codeauthor: Krzysztof Pawlowski :maturity: new diff --git a/salt/modules/file.py b/salt/modules/file.py index 90d4632aee..faa519af41 100644 --- a/salt/modules/file.py +++ b/salt/modules/file.py @@ -3956,9 +3956,9 @@ def get_diff( if isinstance(env, six.string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' not ' - '\'env\'. This functionality will be removed in Salt Boron.' + '\'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/modules/firewalld.py b/salt/modules/firewalld.py index e7d214d011..6a727669dc 100644 --- a/salt/modules/firewalld.py +++ b/salt/modules/firewalld.py @@ -639,7 +639,7 @@ def make_permanent(): ''' Make current runtime configuration permanent. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -654,7 +654,7 @@ def get_interfaces(zone): ''' List interfaces bound to a zone - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -669,7 +669,7 @@ def add_interface(zone, interface): ''' Bind an interface to a zone - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -687,7 +687,7 @@ def remove_interface(zone, interface): ''' Remove an interface bound to a zone - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -705,7 +705,7 @@ def get_sources(zone): ''' List sources bound to a zone - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -720,7 +720,7 @@ def add_source(zone, source): ''' Bind a source to a zone - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -738,7 +738,7 @@ def remove_source(zone, source): ''' Remove a source bound to a zone - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/git.py b/salt/modules/git.py index 581548b959..1989a64546 100644 --- a/salt/modules/git.py +++ b/salt/modules/git.py @@ -700,7 +700,7 @@ def clone(cwd, Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file - .. versionadded:: Boron + .. versionadded:: 2016.3.0 https_user Set HTTP Basic Auth username. Only accepted for HTTPS URLs. @@ -1396,7 +1396,7 @@ def fetch(cwd, Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ignore_retcode : False If ``True``, do not log an error to the minion log if the git command @@ -2040,7 +2040,7 @@ def ls_remote(cwd=None, Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file - .. versionadded:: Boron + .. versionadded:: 2016.3.0 https_user Set HTTP Basic Auth username. Only accepted for HTTPS URLs. @@ -2462,7 +2462,7 @@ def pull(cwd, opts='', user=None, identity=None, ignore_retcode=False): Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ignore_retcode : False If ``True``, do not log an error to the minion log if the git command @@ -2546,7 +2546,7 @@ def push(cwd, Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ignore_retcode : False If ``True``, do not log an error to the minion log if the git command @@ -2746,7 +2746,7 @@ def remote_refs(url, Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file - .. versionadded:: Boron + .. versionadded:: 2016.3.0 https_user Set HTTP Basic Auth username. Only accepted for HTTPS URLs. @@ -3322,7 +3322,7 @@ def submodule(cwd, Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ignore_retcode : False If ``True``, do not log an error to the minion log if the git command diff --git a/salt/modules/github.py b/salt/modules/github.py index c38e77cab3..8338dbf2a5 100644 --- a/salt/modules/github.py +++ b/salt/modules/github.py @@ -2,7 +2,7 @@ ''' Module for interop with the Github v3 API -.. versionadded:: Boron. +.. versionadded:: 2016.3.0. :depends: - PyGithub python module :configuration: Configure this module by specifying the name of a configuration diff --git a/salt/modules/glance.py b/salt/modules/glance.py index 32f059acde..80b91389cd 100644 --- a/salt/modules/glance.py +++ b/salt/modules/glance.py @@ -379,9 +379,9 @@ def image_show(id=None, name=None, profile=None): # pylint: disable=C0103 image.name, pformat(image))) ret_details = {} # I may want to use this code on Beryllium - # until we got Boron packages for Ubuntu + # until we got 2016.3.0 packages for Ubuntu # so please keep this code until Carbon! - warn_until('Carbon', 'Starting with \'Boron\' image_show() ' + warn_until('Carbon', 'Starting with \'2016.3.0\' image_show() ' 'will stop wrapping the returned image in another ' 'dictionary.') if CUR_VER < BORON: @@ -413,9 +413,9 @@ def image_list(id=None, profile=None, name=None): # pylint: disable=C0103 # return False # # I may want to use this code on Beryllium - # until we got Boron packages for Ubuntu + # until we got 2016.3.0 packages for Ubuntu # so please keep this code until Carbon! - warn_until('Carbon', 'Starting in \'Boron\' image_list() ' + warn_until('Carbon', 'Starting in \'2016.3.0\' image_list() ' 'will return a list of images instead of a dictionary ' 'keyed with the images\' names.') if CUR_VER < BORON: @@ -494,9 +494,9 @@ def image_update(id=None, name=None, profile=None, **kwargs): # pylint: disable g_client = _auth(profile) updated = g_client.images.update(image['id'], **to_update) # I may want to use this code on Beryllium - # until we got Boron packages for Ubuntu + # until we got 2016.3.0 packages for Ubuntu # so please keep this code until Carbon! - warn_until('Carbon', 'Starting with \'Boron\' image_update() ' + warn_until('Carbon', 'Starting with \'2016.3.0\' image_update() ' 'will stop wrapping the returned, updated image in ' 'another dictionary.') if CUR_VER < BORON: diff --git a/salt/modules/grains.py b/salt/modules/grains.py index a6a5a8f1b7..7e94994f24 100644 --- a/salt/modules/grains.py +++ b/salt/modules/grains.py @@ -356,7 +356,7 @@ def remove(key, val, delimiter=DEFAULT_TARGET_DELIM): You can now append values to a list in nested dictionary grains. If the list doesn't exist at this level, it will be created. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/hashutil.py b/salt/modules/hashutil.py index 65a7947837..77ce7798fd 100644 --- a/salt/modules/hashutil.py +++ b/salt/modules/hashutil.py @@ -80,7 +80,7 @@ def base64_b64encode(instr): Among other possible differences, the "modern" encoder does not include newline ('\\n') characters in the encoded output. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -99,7 +99,7 @@ def base64_b64decode(instr): ''' Decode a base64-encoded string using the "modern" Python interface - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -144,7 +144,7 @@ def base64_encodefile(fname): ''' Read a file from the file system and return as a base64 encoded string - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Pillar example: diff --git a/salt/modules/hosts.py b/salt/modules/hosts.py index ddcf5a671e..28a80c3303 100644 --- a/salt/modules/hosts.py +++ b/salt/modules/hosts.py @@ -143,7 +143,7 @@ def set_host(ip, alias): Set the host entry in the hosts file for the given ip, this will overwrite any previous entry for the given ip - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 If ``alias`` does not include any host names (it is the empty string or contains only whitespace), all entries for the given IP address are removed. diff --git a/salt/modules/infoblox.py b/salt/modules/infoblox.py index a1e3a0ddda..f4bc700b09 100644 --- a/salt/modules/infoblox.py +++ b/salt/modules/infoblox.py @@ -4,7 +4,7 @@ Module for managing Infoblox Will look for pillar data infoblox:server, infoblox:user, infoblox:password if not passed to functions -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :depends: - requests diff --git a/salt/modules/jenkins.py b/salt/modules/jenkins.py index 89d5161016..07dfad0567 100644 --- a/salt/modules/jenkins.py +++ b/salt/modules/jenkins.py @@ -2,7 +2,7 @@ ''' Module for controlling Jenkins -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :configuration: This module can be used by either passing an api key and version directly or by specifying both in a configuration profile in the salt diff --git a/salt/modules/k8s.py b/salt/modules/k8s.py index 694c633a85..028cfb348a 100644 --- a/salt/modules/k8s.py +++ b/salt/modules/k8s.py @@ -2,7 +2,7 @@ ''' Salt module to manage Kubernetes cluster -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Roadmap: diff --git a/salt/modules/ldap3.py b/salt/modules/ldap3.py index 108907e10c..5a379163f9 100644 --- a/salt/modules/ldap3.py +++ b/salt/modules/ldap3.py @@ -3,7 +3,7 @@ Query and modify an LDAP database (alternative interface) ========================================================= -.. versionadded:: Boron +.. versionadded:: 2016.3.0 This is an alternative to the ``ldap`` interface provided by the :py:mod:`ldapmod ` execution module. diff --git a/salt/modules/lxc.py b/salt/modules/lxc.py index f85feb0336..d556ee12a7 100644 --- a/salt/modules/lxc.py +++ b/salt/modules/lxc.py @@ -561,7 +561,7 @@ def _get_profile(key, old_key, name, **kwargs): 'lxc.{1}:{0}'.format(name, old_key), None) if profile_match is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'lxc.{1} has been deprecated, please configure LXC ' 'container profiles under lxc.{0} instead'.format( key, old_key)) @@ -1326,7 +1326,7 @@ def init(name, profile = get_container_profile(copy.deepcopy(profile)) if bool(nic) and nic is not _marker: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'nic\' argument to \'lxc.init\' has been deprecated, ' 'please use \'network_profile\' instead.' ) @@ -1342,7 +1342,7 @@ def init(name, pass else: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'clone\' argument to \'lxc.init\' has been deprecated, ' 'please use \'clone_from\' instead.' ) @@ -1385,8 +1385,8 @@ def init(name, clone_from = select('clone_from') if password and password_encrypted is None: salt.utils.warn_until( - 'Boron', - 'Starting with the Boron release, passwords passed to the ' + 'Carbon', + 'Starting with the Carbon release, passwords passed to the ' '\'lxc.init\' function will be assumed to be hashed, unless ' 'password_encrypted=False. Please keep this in mind.' ) @@ -2434,7 +2434,7 @@ def start(name, **kwargs): _ensure_exists(name, path=path) if kwargs.get('restart', False): salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'restart\' argument to \'lxc.start\' has been deprecated, ' 'please use \'lxc.restart\' instead.' ) @@ -3732,7 +3732,7 @@ def run_cmd(name, Use :mod:`lxc.run ` instead ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'lxc.run_cmd has been deprecated, please use one of the lxc.run ' 'functions (or lxc.retcode). See the documentation for more ' 'information.' @@ -4568,12 +4568,12 @@ def reconfigure(name, utsname utsname of the container. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 rootfs rootfs of the container. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 cpu Select a random number of cpu cores and assign it to the cpuset, if the diff --git a/salt/modules/mac_group.py b/salt/modules/mac_group.py index 9515cc304f..9a2f02ca85 100644 --- a/salt/modules/mac_group.py +++ b/salt/modules/mac_group.py @@ -129,7 +129,7 @@ def deluser(group, name): ''' Remove a user from the group - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -148,7 +148,7 @@ def members(name, members_list): ''' Replaces members of the group with a provided list. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/mac_power.py b/salt/modules/mac_power.py index ffa9b69aa5..3ec183b244 100644 --- a/salt/modules/mac_power.py +++ b/salt/modules/mac_power.py @@ -2,7 +2,7 @@ ''' Module for editing power settings on Mac OS X - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' from __future__ import absolute_import diff --git a/salt/modules/mac_service.py b/salt/modules/mac_service.py index dc6148806c..72a8d9dcd5 100644 --- a/salt/modules/mac_service.py +++ b/salt/modules/mac_service.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' The service module for Mac OS X -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' from __future__ import absolute_import diff --git a/salt/modules/mac_system.py b/salt/modules/mac_system.py index bcb8bf7bcc..570670b8ca 100644 --- a/salt/modules/mac_system.py +++ b/salt/modules/mac_system.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -.. versionadded:: Boron +.. versionadded:: 2016.3.0 System module for sleeping, restarting, and shutting down the system on Mac OS X. diff --git a/salt/modules/mac_user.py b/salt/modules/mac_user.py index b196f25ae7..c08441b2ab 100644 --- a/salt/modules/mac_user.py +++ b/salt/modules/mac_user.py @@ -454,7 +454,7 @@ def rename(name, new_name): def get_auto_login(): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Gets the current setting for Auto Login @@ -477,7 +477,7 @@ def get_auto_login(): def enable_auto_login(name): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Configures the machine to auto login with the specified user @@ -504,7 +504,7 @@ def enable_auto_login(name): def disable_auto_login(): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Disables auto login on the machine diff --git a/salt/modules/mdata.py b/salt/modules/mdata.py index 571041eed4..39e5ac8304 100644 --- a/salt/modules/mdata.py +++ b/salt/modules/mdata.py @@ -2,7 +2,7 @@ ''' Module for managaging metadata in SmartOS Zones -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :maintainer: Jorge Schrauwen :maturity: new diff --git a/salt/modules/monit.py b/salt/modules/monit.py index 801545ef38..a595c7e617 100644 --- a/salt/modules/monit.py +++ b/salt/modules/monit.py @@ -162,7 +162,7 @@ def status(svc_name=''): def reload_(): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Reload monit configuration @@ -178,7 +178,7 @@ def reload_(): def configtest(): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Test monit configuration syntax @@ -206,7 +206,7 @@ def configtest(): def version(): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Return version from monit -V @@ -224,7 +224,7 @@ def version(): def id_(reset=False): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Return monit unique id. @@ -252,7 +252,7 @@ def id_(reset=False): def validate(): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Check all services diff --git a/salt/modules/netaddress.py b/salt/modules/netaddress.py index 0f6484138b..3d5b9c617b 100644 --- a/salt/modules/netaddress.py +++ b/salt/modules/netaddress.py @@ -2,7 +2,7 @@ ''' Module for getting information about network addresses. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :depends: netaddr ''' diff --git a/salt/modules/network.py b/salt/modules/network.py index 4008fda02b..d169d6694a 100644 --- a/salt/modules/network.py +++ b/salt/modules/network.py @@ -840,7 +840,7 @@ def convert_cidr(cidr): ''' returns the network and subnet mask of a cidr addr - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/npm.py b/salt/modules/npm.py index 0d2ed95af0..774eaf6f9e 100644 --- a/salt/modules/npm.py +++ b/salt/modules/npm.py @@ -106,7 +106,7 @@ def install(pkg=None, silent Whether or not to run NPM install with --silent flag. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 dry_run Whether or not to run NPM install with --dry-run flag. diff --git a/salt/modules/opkg.py b/salt/modules/opkg.py index d9781e880c..58919c6a36 100644 --- a/salt/modules/opkg.py +++ b/salt/modules/opkg.py @@ -2,7 +2,7 @@ ''' Support for Opkg -.. versionadded: Boron +.. versionadded: 2016.3.0 .. note:: diff --git a/salt/modules/pillar.py b/salt/modules/pillar.py index f881bcb134..30a47ffe2e 100644 --- a/salt/modules/pillar.py +++ b/salt/modules/pillar.py @@ -313,7 +313,7 @@ def keys(key, delimiter=DEFAULT_TARGET_DELIM): def file_exists(path, saltenv=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 This is a master-only function. Calling from the minion is not supported. diff --git a/salt/modules/pip.py b/salt/modules/pip.py index a7c3daeb25..2de9339fd7 100644 --- a/salt/modules/pip.py +++ b/salt/modules/pip.py @@ -562,15 +562,15 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914 # the `bin_env` argument and we'll take care of the rest. if env and not bin_env: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing \'env\' to the pip module is deprecated. Use bin_env instead. ' - 'This functionality will be removed in Salt Boron.' + 'This functionality will be removed in Salt Carbon.' ) bin_env = env if activate: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing \'activate\' to the pip module is deprecated. If ' 'bin_env refers to a virtualenv, there is no need to activate ' 'that virtualenv before using pip to install packages in it.' @@ -578,10 +578,10 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914 if isinstance(__env__, string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'__env__\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = __env__ @@ -913,10 +913,10 @@ def uninstall(pkgs=None, if isinstance(__env__, string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'__env__\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = __env__ diff --git a/salt/modules/pkg_resource.py b/salt/modules/pkg_resource.py index 3a4452a6c9..732a97ced1 100644 --- a/salt/modules/pkg_resource.py +++ b/salt/modules/pkg_resource.py @@ -105,10 +105,10 @@ def parse_targets(name=None, ''' if '__env__' in kwargs: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'__env__\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = kwargs['__env__'] diff --git a/salt/modules/pkgin.py b/salt/modules/pkgin.py index 42b555d06c..2563565bbc 100644 --- a/salt/modules/pkgin.py +++ b/salt/modules/pkgin.py @@ -128,7 +128,7 @@ def search(pkg_name): def latest_version(*names, **kwargs): ''' - .. versionchanged: Boron + .. versionchanged: 2016.3.0 Return the latest version of the named package available for upgrade or installation. @@ -235,7 +235,7 @@ def refresh_db(): def list_pkgs(versions_as_list=False, **kwargs): ''' - .. versionchanged: Boron + .. versionchanged: 2016.3.0 List the packages currently installed as a dict:: {'': ''} @@ -592,7 +592,7 @@ def file_list(package): def file_dict(*packages): ''' - .. versionchanged: Boron + .. versionchanged: 2016.3.0 List the files that belong to a package. CLI Examples: diff --git a/salt/modules/postgres.py b/salt/modules/postgres.py index 07f1eb68cc..0a6c6eb9b6 100644 --- a/salt/modules/postgres.py +++ b/salt/modules/postgres.py @@ -2101,7 +2101,7 @@ def language_list( password=None, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Return a list of languages in a database. @@ -2157,7 +2157,7 @@ def language_exists( password=None, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Checks if language exists in a database. @@ -2206,7 +2206,7 @@ def language_create(name, password=None, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Installs a language into a database @@ -2263,7 +2263,7 @@ def language_remove(name, password=None, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Removes a language from a database @@ -2537,7 +2537,7 @@ def privileges_list( password=None, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Return a list of privileges for the specified object. @@ -2637,7 +2637,7 @@ def has_privileges(name, password=None, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Check if a role has the specified privileges on an object @@ -2759,7 +2759,7 @@ def privileges_grant(name, password=None, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Grant privileges on a postgres object @@ -2885,7 +2885,7 @@ def privileges_revoke(name, password=None, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Revoke privileges on a postgres object @@ -2991,7 +2991,7 @@ def datadir_init(name, locale=None, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Initializes a postgres data directory @@ -3039,7 +3039,7 @@ def datadir_init(name, def datadir_exists(name): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Checks if postgres data directory has been initialized diff --git a/salt/modules/pushover_notify.py b/salt/modules/pushover_notify.py index 59070811dd..868fbc581a 100644 --- a/salt/modules/pushover_notify.py +++ b/salt/modules/pushover_notify.py @@ -2,7 +2,7 @@ ''' Module for sending messages to Pushover (https://www.pushover.net) -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :configuration: This module can be used by either passing an api key and version directly or by specifying both in a configuration profile in the salt diff --git a/salt/modules/pw_user.py b/salt/modules/pw_user.py index b0af07e10c..deb727cc22 100644 --- a/salt/modules/pw_user.py +++ b/salt/modules/pw_user.py @@ -432,7 +432,7 @@ def get_loginclass(name): ''' Get the login class of the user - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/rabbitmq.py b/salt/modules/rabbitmq.py index 0fc6c6e458..3f8eeb0d78 100644 --- a/salt/modules/rabbitmq.py +++ b/salt/modules/rabbitmq.py @@ -283,7 +283,7 @@ def clear_password(name, runas=None): def check_password(name, password, runas=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Checks if a user's password is valid. diff --git a/salt/modules/redismod.py b/salt/modules/redismod.py index 4f2f7d8280..1d1a31c316 100644 --- a/salt/modules/redismod.py +++ b/salt/modules/redismod.py @@ -509,7 +509,7 @@ def sentinel_get_master_ip(master, host=None, port=None, password=None): ''' Get ip for sentinel master - .. versionadded: Boron + .. versionadded: 2016.3.0 CLI Example: @@ -526,7 +526,7 @@ def get_master_ip(host=None, port=None, password=None): ''' Get host information about slave - .. versionadded: Boron + .. versionadded: 2016.3.0 CLI Example: diff --git a/salt/modules/reg.py b/salt/modules/reg.py index c74101683a..15219066d8 100644 --- a/salt/modules/reg.py +++ b/salt/modules/reg.py @@ -4,7 +4,7 @@ Manage the Windows registry =========================== -The read_key and set_key functions will be updated in Boron to reflect proper +The read_key and set_key functions will be updated in Carbon to reflect proper registry usage. The registry has three main components. Hives, Keys, and Values. ----- @@ -133,7 +133,7 @@ def read_key(hkey, path, key=None, use_32bit_registry=False): ''' .. important:: The name of this function is misleading and will be changed to reflect - proper usage in the Boron release of Salt. The path option will be removed + proper usage in the Carbon release of Salt. The path option will be removed and the key will be the actual key. See the following issue: https://github.com/saltstack/salt/issues/25618 @@ -143,7 +143,7 @@ def read_key(hkey, path, key=None, use_32bit_registry=False): name. If key is not passed, this function will return the default value for the key. - In the Boron release this function will be removed in favor of read_value. + In the Carbon release this function will be removed in favor of read_value. Read registry key value @@ -163,10 +163,10 @@ def read_key(hkey, path, key=None, use_32bit_registry=False): 'vdata': None, 'success': True} - if key: # This if statement will be removed in Boron - salt.utils.warn_until('Boron', 'Use reg.read_value to read a registry ' + if key: # This if statement will be removed in Carbon + salt.utils.warn_until('Carbon', 'Use reg.read_value to read a registry ' 'value. This functionality will be ' - 'removed in Salt Boron') + 'removed in Salt Carbon') return read_value(hive=hkey, key=path, vname=key, @@ -260,7 +260,7 @@ def set_key(hkey, ''' .. important :: The name of this function is misleading and will be changed to reflect - proper usage in the Boron release of Salt. The path option will be removed + proper usage in the Carbon release of Salt. The path option will be removed and the key will be the actual key. See the following issue: https://github.com/saltstack/salt/issues/25618 @@ -270,7 +270,7 @@ def set_key(hkey, name. If key is not passed, this function will return the default value for the key. - In the Boron release this function will be removed in favor of set_value. + In the Carbon release this function will be removed in favor of set_value. Set a registry key @@ -283,10 +283,10 @@ def set_key(hkey, salt '*' reg.set_key HKEY_CURRENT_USER 'SOFTWARE\\Salt' 'version' '0.97' REG_DWORD ''' - if key: # This if statement will be removed in Boron - salt.utils.warn_until('Boron', 'Use reg.set_value to set a registry ' + if key: # This if statement will be removed in Carbon + salt.utils.warn_until('Carbon', 'Use reg.set_value to set a registry ' 'value. This functionality will be ' - 'removed in Salt Boron') + 'removed in Salt Carbon') return set_value(hive=hkey, key=path, vname=key, @@ -339,7 +339,7 @@ def set_value(hive, .. deprecated:: 2015.8.2 Use ``use_32bit_registry`` instead. The parameter seems to have no effect since Windows 7 / Windows 2008R2 removed support for reflection. The - parameter will be removed in Boron. + parameter will be removed in Carbon. :return: Returns True if successful, False if not @@ -379,7 +379,7 @@ def create_key(hkey, ''' .. important :: The name of this function is misleading and will be changed to reflect - proper usage in the Boron release of Salt. The path option will be removed + proper usage in the Carbon release of Salt. The path option will be removed and the key will be the actual key. See the following issue: https://github.com/saltstack/salt/issues/25618 @@ -389,7 +389,7 @@ def create_key(hkey, If key is not passed, this function will return the default value for the key. - In the Boron release path will be removed and key will be the path. You will + In the Carbon release path will be removed and key will be the path. You will not pass value. Create a registry key @@ -400,10 +400,10 @@ def create_key(hkey, salt '*' reg.create_key HKEY_CURRENT_USER 'SOFTWARE\\Salt' 'version' '0.97' ''' - if key: # This if statement will be removed in Boron - salt.utils.warn_until('Boron', 'Use reg.set_value to create a registry ' + if key: # This if statement will be removed in Carbon + salt.utils.warn_until('Carbon', 'Use reg.set_value to create a registry ' 'value. This functionality will be ' - 'removed in Salt Boron') + 'removed in Salt Carbon') return set_value(hive=hkey, key=path, vname=key, @@ -422,7 +422,7 @@ def delete_key(hkey, ''' .. important:: The name of this function is misleading and will be changed to reflect - proper usage in the Boron release of Salt. The path option will be removed + proper usage in the Carbon release of Salt. The path option will be removed and the key will be the actual key. See the following issue: https://github.com/saltstack/salt/issues/25618 @@ -432,7 +432,7 @@ def delete_key(hkey, name. If key is not passed, this function will return the default value for the key. - In the Boron release path will be removed and key will be the path. + In the Carbon release path will be removed and key will be the path. reflection will also be removed. Delete a registry key @@ -453,14 +453,14 @@ def delete_key(hkey, :param str path: (will be changed to key) The key (looks like a path) to remove. - :param str key: (used incorrectly) Will be removed in Boron + :param str key: (used incorrectly) Will be removed in Carbon :param bool reflection: A boolean value indicating that the value should also be removed from the Wow6432Node portion of the registry. Only applies to 64 bit Windows. This setting is ignored for 32 bit Windows. Only applies to delete value. If the key parameter is passed, this function - calls delete_value instead. Will be changed in Boron. + calls delete_value instead. Will be changed in Carbon. :param bool force: A boolean value indicating that all subkeys should be removed as well. If this is set to False (default) and there are subkeys, @@ -472,11 +472,11 @@ def delete_key(hkey, :rtype: bool ''' - if key: # This if statement will be removed in Boron - salt.utils.warn_until('Boron', + if key: # This if statement will be removed in Carbon + salt.utils.warn_until('Carbon', 'Variable names will be changed to match Windows ' 'Registry terminology. These changes will be ' - 'made in Boron') + 'made in Carbon') return delete_value(hive=hkey, key=path, vname=key, @@ -604,7 +604,7 @@ def delete_value(hive, key, vname=None, reflection=True, use_32bit_registry=Fals .. deprecated:: 2015.8.2 Use ``use_32bit_registry`` instead. The parameter seems to have no effect since Windows 7 / Windows 2008R2 removed support for reflection. This - parameter will be removed in Boron. + parameter will be removed in Carbon. :return: Returns True if successful, False if not diff --git a/salt/modules/rsync.py b/salt/modules/rsync.py index 1de853c628..402d8f10dc 100644 --- a/salt/modules/rsync.py +++ b/salt/modules/rsync.py @@ -52,7 +52,7 @@ def rsync(src, exclude=None, excludefrom=None): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Return data now contains just the output of the rsync command, instead of a dictionary as returned from :py:func:`cmd.run_all `. @@ -95,7 +95,7 @@ def rsync(src, def version(): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Return data now contains just the version number as a string, instead of a dictionary as returned from :py:func:`cmd.run_all `. @@ -122,7 +122,7 @@ def version(): def config(conf_path='/etc/rsyncd.conf'): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Return data now contains just the contents of the rsyncd.conf as a string, instead of a dictionary as returned from :py:func:`cmd.run_all `. diff --git a/salt/modules/selinux.py b/salt/modules/selinux.py index 3d8a2f6d93..f3139b9fb9 100644 --- a/salt/modules/selinux.py +++ b/salt/modules/selinux.py @@ -203,7 +203,7 @@ def getsemod(module): salt '*' selinux.getsemod mysql - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' return list_semod().get(module, {}) @@ -218,7 +218,7 @@ def setsemod(module, state): salt '*' selinux.setsemod nagios Enabled - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if state.lower() == 'enabled': cmd = 'semodule -e {0}'.format(module) @@ -238,7 +238,7 @@ def list_semod(): salt '*' selinux.list_semod - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' mdata = __salt__['cmd.run']('semodule -l').splitlines() ret = {} diff --git a/salt/modules/smartos_virt.py b/salt/modules/smartos_virt.py index 002b02950f..e7b90563ec 100644 --- a/salt/modules/smartos_virt.py +++ b/salt/modules/smartos_virt.py @@ -244,7 +244,7 @@ def get_macs(domain): # Deprecated aliases def create(domain): ''' - .. deprecated:: Boron + .. deprecated:: Nitrogen Use :py:func:`~salt.modules.virt.start` instead. Start a defined domain @@ -261,7 +261,7 @@ def create(domain): def destroy(domain): ''' - .. deprecated:: Boron + .. deprecated:: Nitrogen Use :py:func:`~salt.modules.virt.stop` instead. Power off a defined domain @@ -278,7 +278,7 @@ def destroy(domain): def list_vms(): ''' - .. deprecated:: Boron + .. deprecated:: Nitrogen Use :py:func:`~salt.modules.virt.list_domains` instead. List all virtual machines. diff --git a/salt/modules/solaris_fmadm.py b/salt/modules/solaris_fmadm.py index dba5e7e58e..59aaa6f267 100644 --- a/salt/modules/solaris_fmadm.py +++ b/salt/modules/solaris_fmadm.py @@ -6,7 +6,7 @@ Module for running fmadm and fmdump on Solaris :maturity: new :platform: solaris,illumos -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' from __future__ import absolute_import diff --git a/salt/modules/solaris_system.py b/salt/modules/solaris_system.py index 24ed016efb..5335146e46 100644 --- a/salt/modules/solaris_system.py +++ b/salt/modules/solaris_system.py @@ -4,7 +4,7 @@ Support for reboot, shutdown, etc This module is assumes we are using solaris-like shutdown -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' from __future__ import absolute_import diff --git a/salt/modules/splunk.py b/salt/modules/splunk.py index 8f41f1a4ae..7fd589264d 100644 --- a/salt/modules/splunk.py +++ b/salt/modules/splunk.py @@ -2,7 +2,7 @@ ''' Module for interop with the Splunk API -.. versionadded:: Boron. +.. versionadded:: 2016.3.0. :depends: - splunk-sdk python module diff --git a/salt/modules/ssh.py b/salt/modules/ssh.py index db5431a85a..43e5a27b5c 100644 --- a/salt/modules/ssh.py +++ b/salt/modules/ssh.py @@ -367,9 +367,9 @@ def check_key_file(user, ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -455,9 +455,9 @@ def rm_auth_key_from_file(user, ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -579,9 +579,9 @@ def set_auth_key_from_file(user, ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -797,7 +797,7 @@ def recv_known_host(hostname, time anything was read from that host, then the connection is closed and the host in question considered unavailable. Default is 5 seconds. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -970,7 +970,7 @@ def set_known_host(user=None, time anything was read from that host, then the connection is closed and the host in question considered unavailable. Default is 5 seconds. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/state.py b/salt/modules/state.py index e315de34dc..e700ed56e4 100644 --- a/salt/modules/state.py +++ b/salt/modules/state.py @@ -259,9 +259,9 @@ def template(tem, queue=False, **kwargs): ''' if 'env' in kwargs: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) saltenv = kwargs['env'] elif 'saltenv' in kwargs: @@ -481,7 +481,7 @@ def highstate(test=None, Additional pillar data to use for this function. Any pillar keys specified here will overwrite matching keys in the Pillar data. - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 GPG-encrypted CLI Pillar data is now supported via the GPG renderer. See :ref:`here ` for details. @@ -489,7 +489,7 @@ def highstate(test=None, Specify which renderer to use to decrypt encrypted data located within the ``pillar`` value. Currently, only ``gpg`` is supported. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 queue : False Instead of failing immediately when another state run is in progress, @@ -549,9 +549,9 @@ def highstate(test=None, if 'env' in kwargs: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) opts['environment'] = kwargs['env'] elif 'saltenv' in kwargs: @@ -631,7 +631,7 @@ def sls(mods, Additional pillar data to use for this function. Any pillar keys specified here will overwrite matching keys in the Pillar data. - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 GPG-encrypted CLI Pillar data is now supported via the GPG renderer. See :ref:`here ` for details. @@ -639,7 +639,7 @@ def sls(mods, Specify which renderer to use to decrypt encrypted data located within the ``pillar`` value. Currently, only ``gpg`` is supported. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 queue : ``False`` Instead of failing immediately when another state run is in progress, @@ -692,9 +692,9 @@ def sls(mods, concurrent = kwargs.get('concurrent', False) if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -1036,9 +1036,9 @@ def show_low_sls(mods, ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -1091,9 +1091,9 @@ def show_sls(mods, saltenv='base', test=None, queue=False, env=None, **kwargs): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -1152,9 +1152,9 @@ def show_top(queue=False, **kwargs): opts = copy.deepcopy(__opts__) if 'env' in kwargs: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) opts['environment'] = kwargs['env'] elif 'saltenv' in kwargs: @@ -1488,7 +1488,7 @@ def event(tagmatch='*', r''' Watch Salt's event bus and block until the given tag is matched - .. versionadded:: Boron + .. versionadded:: 2016.3.0 This is useful for utilizing Salt's event bus from shell scripts or for taking simple actions directly from the CLI. diff --git a/salt/modules/status.py b/salt/modules/status.py index 908d343e02..6cd5f954d8 100644 --- a/salt/modules/status.py +++ b/salt/modules/status.py @@ -831,7 +831,7 @@ def master(master=None, connected=True): def time(format='%A, %d. %B %Y %I:%M%p'): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Return the current time on the minion, formated based on the format parameter. diff --git a/salt/modules/sysfs.py b/salt/modules/sysfs.py index 775959382d..4c1eb675d3 100644 --- a/salt/modules/sysfs.py +++ b/salt/modules/sysfs.py @@ -3,7 +3,7 @@ Module for interfacing with SysFS .. seealso:: https://www.kernel.org/doc/Documentation/filesystems/sysfs.txt -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' # Import python libs from __future__ import absolute_import diff --git a/salt/modules/sysmod.py b/salt/modules/sysmod.py index 3abe7bc7bc..53cb01bb3f 100644 --- a/salt/modules/sysmod.py +++ b/salt/modules/sysmod.py @@ -882,7 +882,7 @@ def state_schema(module=''): ''' Return a JSON Schema for the given state function(s) - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/systemd.py b/salt/modules/systemd.py index 1a28582740..4416928071 100644 --- a/salt/modules/systemd.py +++ b/salt/modules/systemd.py @@ -442,7 +442,7 @@ def mask(name, runtime=False): runtime : False Set to ``True`` to mask this service only until the next reboot - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -469,7 +469,7 @@ def mask(name, runtime=False): def masked(name): ''' .. versionadded:: 2015.8.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 The return data for this function has changed. If the service is masked, the return value will now be the output of the ``systemctl is-enabled`` command (so that a persistent mask can be distinguished diff --git a/salt/modules/telemetry.py b/salt/modules/telemetry.py index 6ef5dacf52..5dcd80d31c 100644 --- a/salt/modules/telemetry.py +++ b/salt/modules/telemetry.py @@ -2,7 +2,7 @@ ''' Connection module for Telemetry -.. versionadded:: Boron +.. versionadded:: 2016.3.0 https://github.com/mongolab/mongolab-telemetry-api-docs/blob/master/alerts.md diff --git a/salt/modules/timezone.py b/salt/modules/timezone.py index 6f636dd73d..9acc728431 100644 --- a/salt/modules/timezone.py +++ b/salt/modules/timezone.py @@ -240,7 +240,7 @@ def zone_compare(timezone): /etc/localtime. Returns True if names and hash sums match, and False if not. Mostly useful for running state checks. - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 .. note:: diff --git a/salt/modules/tomcat.py b/salt/modules/tomcat.py index 664f5cf905..7a4d123a23 100644 --- a/salt/modules/tomcat.py +++ b/salt/modules/tomcat.py @@ -556,9 +556,9 @@ def deploy_war(war, ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/modules/vboxmanage.py b/salt/modules/vboxmanage.py index 683fe670b5..0378216e7b 100644 --- a/salt/modules/vboxmanage.py +++ b/salt/modules/vboxmanage.py @@ -2,7 +2,7 @@ ''' Support for VirtualBox using the VBoxManage command -.. versionadded:: Boron +.. versionadded:: 2016.3.0 If the ``vboxdrv`` kernel module is not loaded, this module can automatically load it by configuring ``autoload_vboxdrv`` in ``/etc/salt/minion``: diff --git a/salt/modules/virt.py b/salt/modules/virt.py index 8a08c1b4a7..dfd517c46e 100644 --- a/salt/modules/virt.py +++ b/salt/modules/virt.py @@ -1829,7 +1829,7 @@ def list_snapshots(domain=None): ''' List available snapshots for certain vm or for all. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1857,7 +1857,7 @@ def snapshot(domain, name=None, suffix=None): * **suffix**: Add suffix for the new name. Useful in states, where such snapshots can be distinguished from manually created. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1891,7 +1891,7 @@ def delete_snapshots(name, *names, **kwargs): * **all**: Remove all snapshots. Values: True or False (default False). - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1918,7 +1918,7 @@ def revert_snapshot(name, snapshot=None, cleanup=False): * **cleanup**: Remove all newer than reverted snapshots. Values: True or False (default False). - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1979,7 +1979,7 @@ def revert_snapshot(name, snapshot=None, cleanup=False): # Deprecated aliases def create(domain): ''' - .. deprecated:: Boron + .. deprecated:: 2016.3.0 Use :py:func:`~salt.modules.virt.start` instead. Start a defined domain @@ -1996,7 +1996,7 @@ def create(domain): def destroy(domain): ''' - .. deprecated:: Boron + .. deprecated:: 2016.3.0 Use :py:func:`~salt.modules.virt.stop` instead. Power off a defined domain @@ -2013,7 +2013,7 @@ def destroy(domain): def list_vms(): ''' - .. deprecated:: Boron + .. deprecated:: 2016.3.0 Use :py:func:`~salt.modules.virt.list_domains` instead. List all virtual machines. @@ -2045,7 +2045,7 @@ def cpu_baseline(full=False, migratable=False, out='libvirt'): ''' Return the optimal 'custom' CPU baseline config for VM's on this minion - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param full: Return all CPU features rather than the ones on top of the closest CPU model :param migratable: Exclude CPU features that are unmigratable (libvirt 2.13+) diff --git a/salt/modules/virtualenv_mod.py b/salt/modules/virtualenv_mod.py index 2b266df066..e95d2fecb3 100644 --- a/salt/modules/virtualenv_mod.py +++ b/salt/modules/virtualenv_mod.py @@ -332,7 +332,7 @@ def get_distribution_path(venv, distribution): ''' Return the path to a distribution installed inside a virtualenv - .. versionadded:: Boron + .. versionadded:: 2016.3.0 venv Path to the virtualenv. @@ -377,23 +377,23 @@ def get_resource_path(venv, package Name of the package in which the resource resides - .. versionadded:: Boron + .. versionadded:: 2016.3.0 package_or_requirement Name of the package in which the resource resides - .. deprecated:: Boron + .. deprecated:: Nitrogen Use ``package`` instead. resource Name of the resource of which the path is to be returned - .. versionadded:: Boron + .. versionadded:: 2016.3.0 resource_name Name of the resource of which the path is to be returned - .. deprecated:: Boron + .. deprecated:: Nitrogen .. versionadded:: 2015.5.0 @@ -468,23 +468,23 @@ def get_resource_content(venv, package Name of the package in which the resource resides - .. versionadded:: Boron + .. versionadded:: 2016.3.0 package_or_requirement Name of the package in which the resource resides - .. deprecated:: Boron + .. deprecated:: Nitrogen Use ``package`` instead. resource Name of the resource of which the content is to be returned - .. versionadded:: Boron + .. versionadded:: 2016.3.0 resource_name Name of the resource of which the content is to be returned - .. deprecated:: Boron + .. deprecated:: Nitrogen .. versionadded:: 2015.5.0 diff --git a/salt/modules/win_iis.py b/salt/modules/win_iis.py index 3f163d1dd7..57b7f167ff 100644 --- a/salt/modules/win_iis.py +++ b/salt/modules/win_iis.py @@ -4,7 +4,7 @@ Microsoft IIS site management via WebAdministration powershell module :platform: Windows -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' diff --git a/salt/modules/win_network.py b/salt/modules/win_network.py index 5d8f035c4f..7f75c5df4e 100644 --- a/salt/modules/win_network.py +++ b/salt/modules/win_network.py @@ -301,7 +301,7 @@ def connect(host, port=None, **kwargs): Test connectivity to a host using a particular port from the minion. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: diff --git a/salt/modules/win_system.py b/salt/modules/win_system.py index 15f4296aa8..7903d19a1e 100644 --- a/salt/modules/win_system.py +++ b/salt/modules/win_system.py @@ -435,7 +435,7 @@ get_computer_description = salt.utils.alias_function(get_computer_desc, 'get_com def get_hostname(): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Get the hostname of the windows minion @@ -456,7 +456,7 @@ def get_hostname(): def set_hostname(hostname): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Set the hostname of the windows minion, requires a restart before this will be updated. diff --git a/salt/modules/win_task.py b/salt/modules/win_task.py index 3373bc5933..902f9b20a0 100644 --- a/salt/modules/win_task.py +++ b/salt/modules/win_task.py @@ -2,7 +2,7 @@ # https://msdn.microsoft.com/en-us/library/windows/desktop/aa383608(v=vs.85).aspx ''' Windows Task Scheduler Module -.. versionadded:: Boron +.. versionadded:: 2016.3.0 A module for working with the Windows Task Scheduler. You can add and edit existing tasks. diff --git a/salt/modules/xapi.py b/salt/modules/xapi.py index dfb3eaa370..89ae03009a 100644 --- a/salt/modules/xapi.py +++ b/salt/modules/xapi.py @@ -930,7 +930,7 @@ def vm_diskstats(vm_=None): # Deprecated aliases def create(domain): ''' - .. deprecated:: Boron + .. deprecated:: Nitrogen Use :py:func:`~salt.modules.virt.start` instead. Start a defined domain @@ -947,7 +947,7 @@ def create(domain): def destroy(domain): ''' - .. deprecated:: Boron + .. deprecated:: Nitrogen Use :py:func:`~salt.modules.virt.stop` instead. Power off a defined domain @@ -964,7 +964,7 @@ def destroy(domain): def list_vms(): ''' - .. deprecated:: Boron + .. deprecated:: Nitrogen Use :py:func:`~salt.modules.virt.list_domains` instead. List all virtual machines. diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py index 19d1ee6120..ddae32a26e 100644 --- a/salt/modules/yumpkg.py +++ b/salt/modules/yumpkg.py @@ -1159,7 +1159,7 @@ def upgrade(refresh=True, skip_verify=False, name=None, pkgs=None, normalize=Tru salt '*' pkg.upgrade name=openssl - .. versionadded:: Boron + .. versionadded:: 2016.3.0 pkgs A list of packages to upgrade from a software repository. Must be passed as a python list. A specific version number can be specified @@ -1174,7 +1174,7 @@ def upgrade(refresh=True, skip_verify=False, name=None, pkgs=None, normalize=Tru salt '*' pkg.upgrade pkgs='["foo", "bar"]' salt '*' pkg.upgrade pkgs='["foo", {"bar": "1.2.3-4.el5"}]' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 normalize : True Normalize the package name by removing the architecture. This is useful @@ -1186,7 +1186,7 @@ def upgrade(refresh=True, skip_verify=False, name=None, pkgs=None, normalize=Tru salt -G role:nsd pkg.install gpfs.gplbin-2.6.32-279.31.1.el6.x86_64 normalize=False - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' repo_arg = _get_repo_options(**kwargs) @@ -1502,7 +1502,7 @@ def unhold(name=None, pkgs=None, sources=None, **kwargs): # pylint: disable=W06 def list_holds(pattern=r'\w+(?:[.-][^-]+)*', full=True): r''' - .. versionchanged:: Boron,2015.8.4,2015.5.10 + .. versionchanged:: 2016.3.0,2015.8.4,2015.5.10 Function renamed from ``pkg.get_locked_pkgs`` to ``pkg.list_holds``. List information on locked packages @@ -1648,7 +1648,7 @@ def group_list(): def group_info(name, expand=False): ''' .. versionadded:: 2014.1.0 - .. versionchanged:: Boron,2015.8.4,2015.5.10 + .. versionchanged:: 2016.3.0,2015.8.4,2015.5.10 The return data has changed. A new key ``type`` has been added to distinguish environment groups from package groups. Also, keys for the group name and group ID have been added. The ``mandatory packages``, @@ -1667,7 +1667,7 @@ def group_info(name, expand=False): expanded and the return data will include package names instead of group names. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Example: @@ -1743,7 +1743,7 @@ def group_info(name, expand=False): def group_diff(name): ''' .. versionadded:: 2014.1.0 - .. versionchanged:: Boron,2015.8.4,2015.5.10 + .. versionchanged:: 2016.3.0,2015.8.4,2015.5.10 Environment groups are now supported. The key names have been renamed, similar to the changes made in :py:func:`pkg.group_info `. diff --git a/salt/modules/zenoss.py b/salt/modules/zenoss.py index 7cbb223539..79229beaa4 100644 --- a/salt/modules/zenoss.py +++ b/salt/modules/zenoss.py @@ -2,7 +2,7 @@ ''' Module for working with the Zenoss API -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :configuration: This module requires a 'zenoss' entry in the master/minion config. @@ -179,8 +179,6 @@ def set_prod_state(prod_state, device=None): ''' A function to set the prod_state in zenoss. - versionadded:: Boron - Parameters: prod_state: (Required) Integer value of the state device: (Optional) Will use the grain 'fqdn' by default. diff --git a/salt/modules/zfs.py b/salt/modules/zfs.py index f25e9db675..3ecd53dc5f 100644 --- a/salt/modules/zfs.py +++ b/salt/modules/zfs.py @@ -109,7 +109,7 @@ def exists(name, **kwargs): def create(name, **kwargs): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Create a ZFS File System. @@ -248,7 +248,7 @@ def destroy(name, **kwargs): def rename(name, new_name, **kwargs): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Rename or Relocate a ZFS File System. @@ -308,7 +308,7 @@ def rename(name, new_name, **kwargs): def list_(name=None, **kwargs): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Return a list of all datasets or a specified dataset on the system and the values of their used, available, referenced, and mountpoint properties. @@ -395,7 +395,7 @@ def list_(name=None, **kwargs): def mount(name='-a', **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Mounts ZFS file systems @@ -439,7 +439,7 @@ def mount(name='-a', **kwargs): def unmount(name, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Unmounts ZFS file systems @@ -480,7 +480,7 @@ def unmount(name, **kwargs): def inherit(prop, name, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Clears the specified property @@ -528,7 +528,7 @@ def inherit(prop, name, **kwargs): def diff(name_a, name_b, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Display the difference between a snapshot of a given filesystem and another snapshot of that filesystem from a later time or the current @@ -578,7 +578,7 @@ def diff(name_a, name_b, **kwargs): def rollback(name, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Roll back the given dataset to a previous snapshot. @@ -643,7 +643,7 @@ def rollback(name, **kwargs): def clone(name_a, name_b, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Creates a clone of the given snapshot. @@ -708,7 +708,7 @@ def clone(name_a, name_b, **kwargs): def promote(name): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Promotes a clone file system to no longer be dependent on its "origin" snapshot. @@ -755,7 +755,7 @@ def promote(name): def bookmark(snapshot, bookmark): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Creates a bookmark of the given snapshot @@ -811,7 +811,7 @@ def bookmark(snapshot, bookmark): def holds(snapshot, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Lists all existing user references for the given snapshot or snapshots. @@ -863,7 +863,7 @@ def holds(snapshot, **kwargs): def hold(tag, *snapshot, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Adds a single reference, named with the tag argument, to the specified snapshot or snapshots. @@ -942,7 +942,7 @@ def hold(tag, *snapshot, **kwargs): def release(tag, *snapshot, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Removes a single reference, named with the tag argument, from the specified snapshot or snapshots. @@ -1019,7 +1019,7 @@ def release(tag, *snapshot, **kwargs): def snapshot(*snapshot, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Creates snapshots with the given names. @@ -1098,7 +1098,7 @@ def snapshot(*snapshot, **kwargs): def set(*dataset, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Sets the property or list of properties to the given value(s) for each dataset. @@ -1180,7 +1180,7 @@ def set(*dataset, **kwargs): def get(*dataset, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Displays properties for the given datasets. diff --git a/salt/modules/zpool.py b/salt/modules/zpool.py index 7ba6513602..6588d07171 100644 --- a/salt/modules/zpool.py +++ b/salt/modules/zpool.py @@ -68,7 +68,7 @@ def __virtual__(): def healthy(): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Check if all zpools are healthy @@ -89,7 +89,7 @@ def healthy(): def status(zpool=None): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Return the status of the named zpool @@ -198,7 +198,7 @@ def status(zpool=None): def iostat(zpool=None, sample_time=0): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Display I/O statistics for the given pools @@ -318,10 +318,10 @@ def zpool_list(): salt '*' zpool.zpool_list ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'zpool_list()\' module function is being deprecated and is ' 'being renamed to \'list()\'. This function \'zpool_list()\' will be removed in ' - 'Salt Boron.' + 'Salt Carbon.' ) return list_() @@ -329,7 +329,7 @@ def zpool_list(): def list_(properties='size,alloc,free,cap,frag,health', zpool=None): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Return information about (all) storage pools @@ -391,7 +391,7 @@ def list_(properties='size,alloc,free,cap,frag,health', zpool=None): def get(zpool, prop=None, show_source=False): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Retrieves the given list of properties @@ -445,7 +445,7 @@ def get(zpool, prop=None, show_source=False): def set(zpool, prop, value): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Sets the given property on the specified pool @@ -511,7 +511,7 @@ def exists(zpool): def destroy(zpool, force=False): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Destroys a storage pool @@ -550,7 +550,7 @@ def destroy(zpool, force=False): def scrub(zpool, stop=False): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Scrub a storage pool @@ -596,7 +596,7 @@ def scrub(zpool, stop=False): def create(zpool, *vdevs, **kwargs): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Create a simple zpool, a mirrored zpool, a zpool having nested VDEVs, a hybrid zpool with cache, spare and log drives or a zpool with RAIDZ-1, RAIDZ-2 or RAIDZ-3 @@ -725,7 +725,7 @@ def create(zpool, *vdevs, **kwargs): def add(zpool, *vdevs, **kwargs): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Add the specified vdev\'s to the given storage pool @@ -796,7 +796,7 @@ def add(zpool, *vdevs, **kwargs): def attach(zpool, device, new_device, force=False): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Attach specified device to zpool @@ -862,7 +862,7 @@ def attach(zpool, device, new_device, force=False): def detach(zpool, device): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Detach specified device to zpool @@ -904,7 +904,7 @@ def detach(zpool, device): def replace(zpool, old_device, new_device=None, force=False): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Replaces old_device with new_device. @@ -979,7 +979,7 @@ def replace(zpool, old_device, new_device=None, force=False): @salt.utils.decorators.which('mkfile') def create_file_vdev(size, *vdevs): ''' - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Creates file based ``virtual devices`` for a zpool @@ -1023,7 +1023,7 @@ def create_file_vdev(size, *vdevs): def export(*pools, **kwargs): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Export storage pools @@ -1070,7 +1070,7 @@ def export(*pools, **kwargs): def import_(zpool=None, new_name=None, **kwargs): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Import storage pools or list pools available for import @@ -1170,7 +1170,7 @@ def import_(zpool=None, new_name=None, **kwargs): def online(zpool, *vdevs, **kwargs): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Ensure that the specified devices are online @@ -1245,7 +1245,7 @@ def online(zpool, *vdevs, **kwargs): def offline(zpool, *vdevs, **kwargs): ''' .. versionadded:: 2015.5.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 Ensure that the specified devices are offline @@ -1303,7 +1303,7 @@ def offline(zpool, *vdevs, **kwargs): def reguid(zpool): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Generates a new unique identifier for the pool @@ -1338,7 +1338,7 @@ def reguid(zpool): def reopen(zpool): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Reopen all the vdevs associated with the pool @@ -1369,7 +1369,7 @@ def reopen(zpool): def upgrade(zpool=None, version=None): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Enables all supported features on the given pool @@ -1413,7 +1413,7 @@ def upgrade(zpool=None, version=None): def history(zpool=None, internal=False, verbose=False): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Displays the command history of the specified pools or all pools if no pool is specified diff --git a/salt/netapi/__init__.py b/salt/netapi/__init__.py index 9aeaaa4d32..c151914c08 100644 --- a/salt/netapi/__init__.py +++ b/salt/netapi/__init__.py @@ -113,7 +113,7 @@ class NetapiClient(object): ''' Run :ref:`execution modules ` against subsets of minions - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Wraps :py:meth:`salt.client.LocalClient.cmd_subset` ''' diff --git a/salt/netapi/rest_cherrypy/app.py b/salt/netapi/rest_cherrypy/app.py index 4bf081a6b5..d53aa1933a 100644 --- a/salt/netapi/rest_cherrypy/app.py +++ b/salt/netapi/rest_cherrypy/app.py @@ -345,7 +345,7 @@ def salt_token_tool(): def salt_api_acl_tool(username, request): ''' - ..versionadded:: Boron + ..versionadded:: 2016.3.0 Verifies user requests against the API whitelist. (User/IP pair) in order to provide whitelisting for the API similar to the diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py index efb96394b0..b4fffc191c 100644 --- a/salt/pillar/__init__.py +++ b/salt/pillar/__init__.py @@ -38,9 +38,9 @@ def get_pillar(opts, grains, minion_id, saltenv=None, ext=None, env=None, funcs= ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -60,9 +60,9 @@ def get_async_pillar(opts, grains, minion_id, saltenv=None, ext=None, env=None, ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -237,10 +237,10 @@ class Pillar(object): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/pillar/mysql.py b/salt/pillar/mysql.py index 4b95f792b4..428b19c043 100644 --- a/salt/pillar/mysql.py +++ b/salt/pillar/mysql.py @@ -20,7 +20,7 @@ If there's a keyword arg of mysql_query, that'll go first before other args. This legacy compatibility translates to depth 1. We do this so that it's backward compatible with older configs. -This is deprecated and slated to be removed in Boron. +This is deprecated and slated to be removed in Carbon. Configuring the mysql ext_pillar ===================================== @@ -132,10 +132,10 @@ class MySQLExtPillar(SqlBaseExtPillar): # Handle legacy query specification if 'mysql_query' in kwargs: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The legacy mysql_query configuration parameter is deprecated.' 'See the docs for the new style of configuration.' - 'This functionality will be removed in Salt Boron.' + 'This functionality will be removed in Salt Carbon.' ) args.insert(0, kwargs.pop('mysql_query')) diff --git a/salt/pillar/sqlcipher.py b/salt/pillar/sqlcipher.py index 7f3fc7a7be..ac1d6cac06 100644 --- a/salt/pillar/sqlcipher.py +++ b/salt/pillar/sqlcipher.py @@ -2,7 +2,7 @@ ''' Retrieve Pillar data by running a SQLCipher query -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Python SQLCipher support is provided by the pysqlcipher Python package. You need this module installed to query diff --git a/salt/pillar/stack.py b/salt/pillar/stack.py index 17da35aa91..bfd5fe5b8d 100644 --- a/salt/pillar/stack.py +++ b/salt/pillar/stack.py @@ -27,7 +27,7 @@ It supports the following features: Installation ------------ -PillarStack is already bundled with Salt since Boron version so there is +PillarStack is already bundled with Salt since 2016.3.0 version so there is nothing to install from version 2016.3.0. If you use an older Salt version or you want to override PillarStack with a diff --git a/salt/queues/pgjsonb_queue.py b/salt/queues/pgjsonb_queue.py index 66f73c055b..2c62619468 100644 --- a/salt/queues/pgjsonb_queue.py +++ b/salt/queues/pgjsonb_queue.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -.. versionadded:: Boron +.. versionadded:: 2016.3.0 This is a queue with postgres as the backend. It uses the jsonb store to store information for queues. diff --git a/salt/renderers/gpg.py b/salt/renderers/gpg.py index 6ead5d2026..8ed28910d6 100644 --- a/salt/renderers/gpg.py +++ b/salt/renderers/gpg.py @@ -95,7 +95,7 @@ data like so: Encrypted CLI Pillar Data ------------------------- -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Functions like :py:func:`state.highstate ` and :py:func:`state.sls ` allow for pillar data to be @@ -105,7 +105,7 @@ passed on the CLI. salt myminion state.highstate pillar="{'mypillar': 'foo'}" -Starting with the Boron release of Salt, it is now possible for this pillar +Starting with the 2016.3.0 release of Salt, it is now possible for this pillar data to be GPG-encrypted, and to use the GPG renderer to decrypt it. diff --git a/salt/returners/carbon_return.py b/salt/returners/carbon_return.py index 2d2fb4ecc8..d72cc7001f 100644 --- a/salt/returners/carbon_return.py +++ b/salt/returners/carbon_return.py @@ -73,7 +73,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/couchdb_return.py b/salt/returners/couchdb_return.py index cd1c0e7156..b06cdda2ce 100644 --- a/salt/returners/couchdb_return.py +++ b/salt/returners/couchdb_return.py @@ -33,7 +33,7 @@ To use the alternative configuration, append ``--return_config alternative`` to To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/hipchat_return.py b/salt/returners/hipchat_return.py index 86a78b17a0..4d64f9c409 100644 --- a/salt/returners/hipchat_return.py +++ b/salt/returners/hipchat_return.py @@ -76,7 +76,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/influxdb_return.py b/salt/returners/influxdb_return.py index 825da1f223..b62f1ab2f8 100644 --- a/salt/returners/influxdb_return.py +++ b/salt/returners/influxdb_return.py @@ -43,7 +43,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/memcache_return.py b/salt/returners/memcache_return.py index 8411188aa8..db1a0a9a4e 100644 --- a/salt/returners/memcache_return.py +++ b/salt/returners/memcache_return.py @@ -38,7 +38,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/mongo_future_return.py b/salt/returners/mongo_future_return.py index 6f8c82266a..2d9a02160b 100644 --- a/salt/returners/mongo_future_return.py +++ b/salt/returners/mongo_future_return.py @@ -56,7 +56,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/mongo_return.py b/salt/returners/mongo_return.py index ac73533484..279c0ea0ba 100644 --- a/salt/returners/mongo_return.py +++ b/salt/returners/mongo_return.py @@ -45,7 +45,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash @@ -53,7 +53,7 @@ To override individual configuration items, append --return_kwargs '{"key:": "va To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/mysql.py b/salt/returners/mysql.py index 2b0b4dae87..b693ee3463 100644 --- a/salt/returners/mysql.py +++ b/salt/returners/mysql.py @@ -117,7 +117,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/nagios_return.py b/salt/returners/nagios_return.py index 3a50325219..c51ba4b1f5 100644 --- a/salt/returners/nagios_return.py +++ b/salt/returners/nagios_return.py @@ -41,7 +41,7 @@ Nagios settings may also be configured as:: To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/odbc.py b/salt/returners/odbc.py index 042ea3408c..7a19cba8e2 100644 --- a/salt/returners/odbc.py +++ b/salt/returners/odbc.py @@ -116,7 +116,7 @@ correctly. Replace with equivalent SQL for other ODBC-compliant servers To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/pgjsonb.py b/salt/returners/pgjsonb.py index a8b48b7596..6f4963aa79 100644 --- a/salt/returners/pgjsonb.py +++ b/salt/returners/pgjsonb.py @@ -122,7 +122,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/postgres.py b/salt/returners/postgres.py index d53d92f6b4..5d0511d4df 100644 --- a/salt/returners/postgres.py +++ b/salt/returners/postgres.py @@ -88,7 +88,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/pushover_returner.py b/salt/returners/pushover_returner.py index 8f6d68d62c..ece9d63159 100644 --- a/salt/returners/pushover_returner.py +++ b/salt/returners/pushover_returner.py @@ -2,7 +2,7 @@ ''' Return salt data via pushover (http://www.pushover.net) -.. versionadded:: Boron +.. versionadded:: 2016.3.0 The following fields can be set in the minion conf file:: @@ -70,8 +70,6 @@ PushOver settings may also be configured as:: To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron - .. code-block:: bash salt '*' test.ping --return pushover --return_kwargs '{"title": "Salt is awesome!"}' diff --git a/salt/returners/redis_return.py b/salt/returners/redis_return.py index d654ccb593..5278e3c986 100644 --- a/salt/returners/redis_return.py +++ b/salt/returners/redis_return.py @@ -38,7 +38,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/slack_returner.py b/salt/returners/slack_returner.py index 605d52814d..28cc5005de 100644 --- a/salt/returners/slack_returner.py +++ b/salt/returners/slack_returner.py @@ -69,7 +69,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/smtp_return.py b/salt/returners/smtp_return.py index 95109b9f30..2be633bbae 100644 --- a/salt/returners/smtp_return.py +++ b/salt/returners/smtp_return.py @@ -71,7 +71,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/sqlite3_return.py b/salt/returners/sqlite3_return.py index 41100eee9d..4fc63f9a56 100644 --- a/salt/returners/sqlite3_return.py +++ b/salt/returners/sqlite3_return.py @@ -73,7 +73,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/returners/xmpp_return.py b/salt/returners/xmpp_return.py index 32f340a1c8..353c1895c0 100644 --- a/salt/returners/xmpp_return.py +++ b/salt/returners/xmpp_return.py @@ -58,7 +58,7 @@ To use the alternative configuration, append '--return_config alternative' to th To override individual configuration items, append --return_kwargs '{"key:": "value"}' to the salt command. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: bash diff --git a/salt/runners/cache.py b/salt/runners/cache.py index 674a85e9e7..bbedb4c6e7 100644 --- a/salt/runners/cache.py +++ b/salt/runners/cache.py @@ -37,7 +37,7 @@ def grains(tgt=None, expr_form='glob', outputter=None, **kwargs): tgt = '*' # targat all minions for backward compatibility elif tgt is None and isinstance(deprecated_minion, string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'minion\' argument to the cache.grains runner is ' 'deprecated. Please specify the minion using the \'tgt\' ' 'argument.' @@ -52,7 +52,7 @@ def grains(tgt=None, expr_form='glob', outputter=None, **kwargs): cached_grains = pillar_util.get_minion_grains() if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the cache.grains runner has ' 'been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' @@ -77,7 +77,7 @@ def pillar(tgt=None, expr_form='glob', outputter=None, **kwargs): tgt = '*' # targat all minions for backward compatibility elif tgt is None and isinstance(deprecated_minion, string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'minion\' argument to the cache.pillar runner is ' 'deprecated. Please specify the minion using the \'tgt\' ' 'argument.' @@ -94,7 +94,7 @@ def pillar(tgt=None, expr_form='glob', outputter=None, **kwargs): cached_pillar = pillar_util.get_minion_pillar() if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the cache.pillar runner has ' 'been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' @@ -119,7 +119,7 @@ def mine(tgt=None, expr_form='glob', outputter=None, **kwargs): tgt = '*' # targat all minions for backward compatibility elif tgt is None and isinstance(deprecated_minion, string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'minion\' argument to the cache.mine runner is ' 'deprecated. Please specify the minion using the \'tgt\' ' 'argument.' @@ -136,7 +136,7 @@ def mine(tgt=None, expr_form='glob', outputter=None, **kwargs): cached_mine = pillar_util.get_cached_mine_data() if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the cache.mine runner has ' 'been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' diff --git a/salt/runners/fileserver.py b/salt/runners/fileserver.py index c6efe0221a..712200eabb 100644 --- a/salt/runners/fileserver.py +++ b/salt/runners/fileserver.py @@ -41,7 +41,7 @@ def envs(backend=None, sources=False, outputter=None): if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the fileserver.envs runner has ' 'been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' @@ -84,7 +84,7 @@ def file_list(saltenv='base', backend=None, outputter=None): if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the fileserver.file_list runner ' 'has been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' @@ -127,7 +127,7 @@ def symlink_list(saltenv='base', backend=None, outputter=None): if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the fileserver.symlink_list ' 'runner has been deprecated. Please specify an outputter using ' '--out. See the output of \'salt-run -h\' for more information.' @@ -170,7 +170,7 @@ def dir_list(saltenv='base', backend=None, outputter=None): if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the fileserver.dir_list runner ' 'has been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' @@ -218,7 +218,7 @@ def empty_dir_list(saltenv='base', backend=None, outputter=None): if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the fileserver.empty_dir_list ' 'runner has been deprecated. Please specify an outputter using ' '--out. See the output of \'salt-run -h\' for more information.' diff --git a/salt/runners/jobs.py b/salt/runners/jobs.py index c9c7084fc0..98025d64bd 100644 --- a/salt/runners/jobs.py +++ b/salt/runners/jobs.py @@ -75,7 +75,7 @@ def active(outputter=None, display_progress=False): if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the jobs.active runner ' 'has been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' @@ -162,7 +162,7 @@ def lookup_jid(jid, outputter = None else: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the jobs.lookup_jid runner ' 'has been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' @@ -201,7 +201,7 @@ def list_job(jid, ext_source=None, outputter=None): if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the jobs.list_job runner ' 'has been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' @@ -398,7 +398,7 @@ def print_job(jid, ext_source=None, outputter=None): if outputter: salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'outputter\' argument to the jobs.print_job runner ' 'has been deprecated. Please specify an outputter using --out. ' 'See the output of \'salt-run -h\' for more information.' diff --git a/salt/runners/saltutil.py b/salt/runners/saltutil.py index 2b8dbccdbc..0fba15b95d 100644 --- a/salt/runners/saltutil.py +++ b/salt/runners/saltutil.py @@ -2,7 +2,7 @@ ''' Sync custom types to the Master -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' from __future__ import absolute_import @@ -17,8 +17,6 @@ log = logging.getLogger(__name__) def sync_all(saltenv='base'): ''' - .. versionadded:: Boron - Sync all custom types saltenv : base @@ -49,8 +47,6 @@ def sync_all(saltenv='base'): def sync_modules(saltenv='base'): ''' - .. versionadded:: Boron - Sync execution modules from ``salt://_modules`` to the master saltenv : base @@ -68,8 +64,6 @@ def sync_modules(saltenv='base'): def sync_states(saltenv='base'): ''' - .. versionadded:: Boron - Sync state modules from ``salt://_states`` to the master saltenv : base @@ -87,8 +81,6 @@ def sync_states(saltenv='base'): def sync_grains(saltenv='base'): ''' - .. versionadded:: Boron - Sync grains modules from ``salt://_grains`` to the master saltenv : base @@ -106,8 +98,6 @@ def sync_grains(saltenv='base'): def sync_renderers(saltenv='base'): ''' - .. versionadded:: Boron - Sync renderer modules from from ``salt://_renderers`` to the master saltenv : base @@ -125,8 +115,6 @@ def sync_renderers(saltenv='base'): def sync_returners(saltenv='base'): ''' - .. versionadded:: Boron - Sync returner modules from ``salt://_returners`` to the master saltenv : base @@ -144,8 +132,6 @@ def sync_returners(saltenv='base'): def sync_output(saltenv='base'): ''' - .. versionadded:: Boron - Sync output modules from ``salt://_output`` to the master saltenv : base @@ -163,8 +149,6 @@ def sync_output(saltenv='base'): def sync_proxymodules(saltenv='base'): ''' - .. versionadded:: Boron - Sync proxy modules from ``salt://_proxy`` to the master saltenv : base @@ -182,8 +166,6 @@ def sync_proxymodules(saltenv='base'): def sync_runners(saltenv='base'): ''' - .. versionadded:: Boron - Sync runners from ``salt://_runners`` to the master saltenv : base @@ -201,8 +183,6 @@ def sync_runners(saltenv='base'): def sync_wheel(saltenv='base'): ''' - .. versionadded:: Boron - Sync wheel modules from ``salt://_wheel`` to the master saltenv : base @@ -220,8 +200,6 @@ def sync_wheel(saltenv='base'): def sync_engines(saltenv='base'): ''' - .. versionadded:: Boron - Sync engines from ``salt://_engines`` to the master saltenv : base @@ -239,8 +217,6 @@ def sync_engines(saltenv='base'): def sync_queues(saltenv='base'): ''' - .. versionadded:: Boron - Sync queue modules from ``salt://_queues`` to the master saltenv : base diff --git a/salt/runners/spacewalk.py b/salt/runners/spacewalk.py index a1a0bce19e..1095e1f735 100644 --- a/salt/runners/spacewalk.py +++ b/salt/runners/spacewalk.py @@ -3,7 +3,7 @@ Spacewalk Runner ================ -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Runner to interact with Spacewalk using Spacewalk API diff --git a/salt/runners/state.py b/salt/runners/state.py index 637cfbced7..3f93044fb4 100644 --- a/salt/runners/state.py +++ b/salt/runners/state.py @@ -158,7 +158,7 @@ def event(tagmatch='*', :param pretty: Output the JSON all on a single line if ``False`` (useful for shell tools); pretty-print the JSON output if ``True``. :param node: Watch the minion-side or master-side event bus. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 CLI Examples: diff --git a/salt/serializers/configparser.py b/salt/serializers/configparser.py index 4176e28cf6..0b0b416781 100644 --- a/salt/serializers/configparser.py +++ b/salt/serializers/configparser.py @@ -3,7 +3,7 @@ salt.serializers.configparser ~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Implements a configparser serializer. ''' diff --git a/salt/serializers/python.py b/salt/serializers/python.py index 3c6568aea9..ef1ff2aa33 100644 --- a/salt/serializers/python.py +++ b/salt/serializers/python.py @@ -3,7 +3,7 @@ salt.serializers.python ~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Implements a Python serializer (via pprint.format) ''' diff --git a/salt/state.py b/salt/state.py index 5ea4bbcfc1..cae0e17b66 100644 --- a/salt/state.py +++ b/salt/state.py @@ -3365,10 +3365,10 @@ class MasterHighState(HighState): env=None): if isinstance(env, six.string_types): salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/states/apache_conf.py b/salt/states/apache_conf.py index 4823b25958..de558f9228 100644 --- a/salt/states/apache_conf.py +++ b/salt/states/apache_conf.py @@ -2,7 +2,7 @@ ''' Manage Apache Confs -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Enable and disable apache confs. diff --git a/salt/states/apache_site.py b/salt/states/apache_site.py index 642454e0c3..40abcf6ad5 100644 --- a/salt/states/apache_site.py +++ b/salt/states/apache_site.py @@ -2,7 +2,7 @@ ''' Manage Apache Sites -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Enable and disable apache sites. diff --git a/salt/states/archive.py b/salt/states/archive.py index d4e69b2d62..a0609fbff8 100644 --- a/salt/states/archive.py +++ b/salt/states/archive.py @@ -154,7 +154,7 @@ def extracted(name, archive_user The user to own each extracted file. - .. deprecated:: Boron + .. deprecated:: Carbon replaced by standardized `user` parameter. user @@ -204,7 +204,7 @@ def extracted(name, # remove this whole block after formal deprecation. if archive_user is not None: warn_until( - 'Boron', + 'Carbon', 'Passing \'archive_user\' is deprecated.' 'Pass \'user\' instead.' ) diff --git a/salt/states/augeas.py b/salt/states/augeas.py index 88038a8c06..c9374bf60f 100644 --- a/salt/states/augeas.py +++ b/salt/states/augeas.py @@ -150,7 +150,7 @@ def change(name, context=None, changes=None, lens=None, See the `list of stock lenses `_ shipped with Augeas. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 load_path A list of directories that modules should be searched in. This is in diff --git a/salt/states/boto_cloudtrail.py b/salt/states/boto_cloudtrail.py index 1627d842cb..bbd417edc1 100644 --- a/salt/states/boto_cloudtrail.py +++ b/salt/states/boto_cloudtrail.py @@ -3,7 +3,7 @@ Manage CloudTrail Objects ================= -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Create and destroy CloudTrail objects. Be aware that this interacts with Amazon's services, and so may incur charges. diff --git a/salt/states/boto_ec2.py b/salt/states/boto_ec2.py index fee2587fd1..e03acfcae3 100644 --- a/salt/states/boto_ec2.py +++ b/salt/states/boto_ec2.py @@ -180,7 +180,7 @@ def eni_present( ''' Ensure the EC2 ENI exists. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name Name tag associated with the ENI. @@ -210,7 +210,7 @@ def eni_present( allocate_eip True/False - allocate and associate an EIP to the ENI - .. versionadded:: Boron + .. versionadded:: 2016.3.0 arecords A list of arecord dicts with attributes needed for the DNS add_record state. @@ -219,7 +219,7 @@ def eni_present( Other DNS modules can be called by specifying the provider keyword. By default, the private ENI IP address will be used, set 'public: True' in the arecord dict to use the ENI's public IP address - .. versionadded:: Boron + .. versionadded:: 2016.3.0 region Region to connect to. @@ -459,7 +459,7 @@ def eni_absent( ''' Ensure the EC2 ENI is absent. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name Name tag associated with the ENI. @@ -547,7 +547,7 @@ def snapshot_created(name, ami_name, instance_name, wait_until_available=True, w ''' Create a snapshot from the given instance - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ret = {'name': name, 'result': True, @@ -725,7 +725,7 @@ def instance_present(name, instance_name=None, instance_id=None, image_id=None, (variable) - A dict with region, key and keyid, or a pillar key (string) that contains a dict with region, key and keyid. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ret = {'name': name, 'result': True, @@ -845,7 +845,7 @@ def instance_absent(name, instance_name=None, instance_id=None, (variable) - A dict with region, key and keyid, or a pillar key (string) that contains a dict with region, key and keyid. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ### TODO - Implement 'force' option?? Would automagically turn off ### 'disableApiTermination', as needed before trying to delete. diff --git a/salt/states/boto_elb.py b/salt/states/boto_elb.py index 51f8a93bf7..5fa10085ef 100644 --- a/salt/states/boto_elb.py +++ b/salt/states/boto_elb.py @@ -217,7 +217,7 @@ Overriding the alarm values on the resource: Tags can also be set: -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/boto_iam.py b/salt/states/boto_iam.py index 15c53461aa..3f4b0495e1 100644 --- a/salt/states/boto_iam.py +++ b/salt/states/boto_iam.py @@ -167,12 +167,12 @@ def user_absent(name, delete_keys=True, delete_mfa_devices=True, delete_profile= delete_mfa_devices (bool) Delete all mfa devices from user. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 delete_profile (bool) Delete profile from user. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 region (string) Region to connect to. diff --git a/salt/states/boto_iot.py b/salt/states/boto_iot.py index 7792e0a4f7..480cee0fb5 100644 --- a/salt/states/boto_iot.py +++ b/salt/states/boto_iot.py @@ -3,7 +3,7 @@ Manage IoT Objects ================= -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Create and destroy IoT objects. Be aware that this interacts with Amazon's services, and so may incur charges. diff --git a/salt/states/boto_lambda.py b/salt/states/boto_lambda.py index 46e8cf4c99..0607ff8f79 100644 --- a/salt/states/boto_lambda.py +++ b/salt/states/boto_lambda.py @@ -3,7 +3,7 @@ Manage Lambda Functions ================= -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Create and destroy Lambda Functions. Be aware that this interacts with Amazon's services, and so may incur charges. diff --git a/salt/states/boto_s3_bucket.py b/salt/states/boto_s3_bucket.py index 3acc3d8da4..c7de21d0e4 100644 --- a/salt/states/boto_s3_bucket.py +++ b/salt/states/boto_s3_bucket.py @@ -3,7 +3,7 @@ Manage S3 Buckets ================= -.. versionadded:: Boron +.. versionadded:: 2016.3.0 Create and destroy S3 buckets. Be aware that this interacts with Amazon's services, and so may incur charges. diff --git a/salt/states/boto_secgroup.py b/salt/states/boto_secgroup.py index b5ef89d8a2..a0b3cee717 100644 --- a/salt/states/boto_secgroup.py +++ b/salt/states/boto_secgroup.py @@ -138,7 +138,7 @@ def present( vpc_name The name of the VPC to create the security group in, if any. Exlusive with vpc_id. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. versionadded:: 2015.8.2 @@ -168,7 +168,7 @@ def present( tags List of key:value pairs of tags to set on the security group - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ret = {'name': name, 'result': True, 'comment': '', 'changes': {}} _ret = _security_group_present(name, description, vpc_id=vpc_id, @@ -560,7 +560,7 @@ def absent( vpc_name The name of the VPC to remove the security group from, if any. Exclusive with vpc_name. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 region Region to connect to. @@ -575,7 +575,7 @@ def absent( A dict with region, key and keyid, or a pillar key (string) that contains a dict with region, key and keyid. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ret = {'name': name, 'result': True, 'comment': '', 'changes': {}} diff --git a/salt/states/boto_vpc.py b/salt/states/boto_vpc.py index 93590d5a92..73ca50f66d 100644 --- a/salt/states/boto_vpc.py +++ b/salt/states/boto_vpc.py @@ -306,7 +306,7 @@ def dhcp_options_present(name, dhcp_options_id=None, vpc_name=None, vpc_id=None, A dict with region, key and keyid, or a pillar key (string) that contains a dict with region, key and keyid. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ret = {'name': name, 'result': True, @@ -392,7 +392,7 @@ def dhcp_options_absent(name=None, dhcp_options_id=None, region=None, key=None, A dict with region, key and keyid, or a pillar key (string) that contains a dict with region, key and keyid. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ret = {'name': name, 'result': True, diff --git a/salt/states/chocolatey.py b/salt/states/chocolatey.py index c0b3096153..7f47fa7474 100644 --- a/salt/states/chocolatey.py +++ b/salt/states/chocolatey.py @@ -2,7 +2,7 @@ ''' Manage Chocolatey package installs -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' # Import Python libs diff --git a/salt/states/cmd.py b/salt/states/cmd.py index 77d7aef3bc..97606fb320 100644 --- a/salt/states/cmd.py +++ b/salt/states/cmd.py @@ -994,12 +994,12 @@ def script(name, This is experimental. context - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Overrides default context variables passed to the template. defaults - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Default context passed to the template. diff --git a/salt/states/cron.py b/salt/states/cron.py index 394d579276..c7b0a254b4 100644 --- a/salt/states/cron.py +++ b/salt/states/cron.py @@ -283,7 +283,7 @@ def present(name, The cron job is set commented (prefixed with ``#DISABLED#``). Defaults to False. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 identifier Custom-defined identifier for tracking the cron line for future crontab @@ -491,11 +491,11 @@ def file(name, if isinstance(env, string_types): msg = ( 'Passing a salt environment should be done using \'saltenv\' not ' - '\'env\'. This warning will go away in Salt Boron and this ' + '\'env\'. This warning will go away in Salt Carbon and this ' 'will be the default and expected behavior. Please update your ' 'state files.' ) - salt.utils.warn_until('Boron', msg) + salt.utils.warn_until('Carbon', msg) ret.setdefault('warnings', []).append(msg) # No need to set __env__ = env since that's done in the state machinery diff --git a/salt/states/file.py b/salt/states/file.py index 7247f5bff6..37e0bf08b6 100644 --- a/salt/states/file.py +++ b/salt/states/file.py @@ -1533,11 +1533,11 @@ def managed(name, if isinstance(env, six.string_types): msg = ( 'Passing a salt environment should be done using \'saltenv\' not ' - '\'env\'. This warning will go away in Salt Boron and this ' + '\'env\'. This warning will go away in Salt Carbon and this ' 'will be the default and expected behavior. Please update your ' 'state files.' ) - salt.utils.warn_until('Boron', msg) + salt.utils.warn_until('Carbon', msg) ret.setdefault('warnings', []).append(msg) # No need to set __env__ = env since that's done in the state machinery @@ -1595,7 +1595,7 @@ def managed(name, 'The \'show_diff\' argument to the file.managed state has been ' 'deprecated, please use \'show_changes\' instead.' ) - salt.utils.warn_until('Boron', msg) + salt.utils.warn_until('Carbon', msg) try: if __opts__['test']: @@ -2287,11 +2287,11 @@ def recurse(name, if isinstance(env, six.string_types): msg = ( 'Passing a salt environment should be done using \'saltenv\' not ' - '\'env\'. This warning will go away in Salt Boron and this ' + '\'env\'. This warning will go away in Salt Carbon and this ' 'will be the default and expected behavior. Please update your ' 'state files.' ) - salt.utils.warn_until('Boron', msg) + salt.utils.warn_until('Carbon', msg) ret.setdefault('warnings', []).append(msg) # No need to set __env__ = env since that's done in the state machinery @@ -3779,11 +3779,11 @@ def patch(name, if isinstance(env, six.string_types): msg = ( 'Passing a salt environment should be done using \'saltenv\' not ' - '\'env\'. This warning will go away in Salt Boron and this ' + '\'env\'. This warning will go away in Salt Carbon and this ' 'will be the default and expected behavior. Please update your ' 'state files.' ) - salt.utils.warn_until('Boron', msg) + salt.utils.warn_until('Carbon', msg) ret.setdefault('warnings', []).append(msg) # No need to set __env__ = env since that's done in the state machinery @@ -4425,11 +4425,11 @@ def serialize(name, if isinstance(env, six.string_types): msg = ( 'Passing a salt environment should be done using \'saltenv\' not ' - '\'env\'. This warning will go away in Salt Boron and this ' + '\'env\'. This warning will go away in Salt Carbon and this ' 'will be the default and expected behavior. Please update your ' 'state files.' ) - salt.utils.warn_until('Boron', msg) + salt.utils.warn_until('Carbon', msg) ret.setdefault('warnings', []).append(msg) # No need to set __env__ = env since that's done in the state machinery @@ -4790,7 +4790,7 @@ def decode(name, ''' Decode an encoded file and write it to disk - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name Path of the file to be written. diff --git a/salt/states/firewall.py b/salt/states/firewall.py index b6da25b589..83b0137317 100644 --- a/salt/states/firewall.py +++ b/salt/states/firewall.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' State to check firewall configurations -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' diff --git a/salt/states/firewalld.py b/salt/states/firewalld.py index 4c64c40168..937c0e8fa8 100644 --- a/salt/states/firewalld.py +++ b/salt/states/firewalld.py @@ -263,7 +263,7 @@ def bind(name, ''' Ensure a zone is bound to specific interfaces or sources. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. note:: diff --git a/salt/states/git.py b/salt/states/git.py index b48a2acb27..1ca40772f5 100644 --- a/salt/states/git.py +++ b/salt/states/git.py @@ -278,7 +278,7 @@ def latest(name, Key can be specified as a SaltStack file server URL, eg. salt://location/identity_file - .. versionadded:: Boron + .. versionadded:: 2016.3.0 https_user HTTP Basic Auth username for HTTPS (only) clones @@ -335,7 +335,7 @@ def latest(name, - pkg: git - ssh_known_hosts: gitlab.example.com - .. versionadded:: Boron + .. versionadded:: 2016.3.0 git-website-prod: git.latest: @@ -1605,7 +1605,7 @@ def detached(name, unless=False, **kwargs): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Make sure a repository is cloned to the given target directory and is a detached HEAD checkout of the commit ID resolved from ``ref``. diff --git a/salt/states/github.py b/salt/states/github.py index a7d4e1aace..acc7b47d1a 100644 --- a/salt/states/github.py +++ b/salt/states/github.py @@ -2,7 +2,7 @@ ''' Github User State Module -.. versionadded:: Boron. +.. versionadded:: 2016.3.0. This state is used to ensure presence of users in the Organization. diff --git a/salt/states/glance.py b/salt/states/glance.py index 8bb14ea4c8..952b18e543 100644 --- a/salt/states/glance.py +++ b/salt/states/glance.py @@ -46,7 +46,7 @@ def _find_image(name): return False, 'glanceclient: Unauthorized' log.debug('Got images_dict: {0}'.format(images_dict)) - warn_until('Boron', 'Starting with Boron ' + warn_until('Carbon', 'Starting with Carbon ' '\'glance.image_list\' is not supposed to return ' 'the images wrapped in a separate dict anymore.') if len(images_dict) == 1 and 'images' in images_dict: @@ -124,7 +124,7 @@ def image_present(name, visibility='public', protected=None, protected=protected, visibility=visibility, location=location) # See Salt issue #24568 - warn_until('Boron', 'Starting with Boron ' + warn_until('Carbon', 'Starting with Carbon ' '\'glance.image_create\' is not supposed to return ' 'the image wrapped in a dict anymore.') if len(image.keys()) == 1: @@ -160,7 +160,7 @@ def image_present(name, visibility='public', protected=None, return ret elif len(image.keys()) == 1: # See Salt issue #24568 - warn_until('Boron', 'Starting with Boron ' + warn_until('Carbon', 'Starting with Carbon ' '\'_find_image()\' is not supposed to return ' 'the image wrapped in a dict anymore.') image = image.values()[0] @@ -171,7 +171,7 @@ def image_present(name, visibility='public', protected=None, '\tLast status was "{0}".\n'.format(image['status']) # See Salt issue #24568 - warn_until('Boron', 'Starting with Boron ' + warn_until('Carbon', 'Starting with Carbon ' '\'_find_image()\' is not supposed to return ' 'the image wrapped in a dict anymore.') if len(image.keys()) == 1: @@ -201,7 +201,7 @@ def image_present(name, visibility='public', protected=None, image = __salt__['glance.image_update']( id=image['id'], visibility=visibility) # See Salt issue #24568 - warn_until('Boron', 'Starting with Boron ' + warn_until('Carbon', 'Starting with Carbon ' '\'glance.image_update\' is not supposed to return ' 'the image wrapped in a dict anymore.') if len(image.keys()) == 1: @@ -243,7 +243,7 @@ def image_present(name, visibility='public', protected=None, if 'checksum' not in image: # Refresh our info about the image image = __salt__['glance.image_show'](image['id']) - warn_until('Boron', 'Starting with Boron ' + warn_until('Carbon', 'Starting with Carbon ' '\'glance.image_show\' is not supposed to return ' 'the image wrapped in a dict anymore.') if len(image.keys()) == 1: diff --git a/salt/states/gpg.py b/salt/states/gpg.py index d83e172e83..6cf89bcfee 100644 --- a/salt/states/gpg.py +++ b/salt/states/gpg.py @@ -3,7 +3,7 @@ Management of the GPG keychains ============================== -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' diff --git a/salt/states/grafana_dashboard.py b/salt/states/grafana_dashboard.py index 0277908274..779b257f37 100644 --- a/salt/states/grafana_dashboard.py +++ b/salt/states/grafana_dashboard.py @@ -2,7 +2,7 @@ ''' Manage Grafana v2.0 Dashboards -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/grafana_datasource.py b/salt/states/grafana_datasource.py index 3cbd55bc2d..9d0b4ebddd 100644 --- a/salt/states/grafana_datasource.py +++ b/salt/states/grafana_datasource.py @@ -2,7 +2,7 @@ ''' Manage Grafana v2.0 data sources -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/grains.py b/salt/states/grains.py index 71445ecb7e..0353043c36 100644 --- a/salt/states/grains.py +++ b/salt/states/grains.py @@ -19,7 +19,7 @@ def present(name, value, delimiter=DEFAULT_TARGET_DELIM, force=False): ''' Ensure that a grain is set - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 name The grain name @@ -30,11 +30,11 @@ def present(name, value, delimiter=DEFAULT_TARGET_DELIM, force=False): :param force: If force is True, the existing grain will be overwritten regardless of its existing or provided value type. Defaults to False - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param delimiter: A delimiter different from the default can be provided. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 It is now capable to set a grain to a complex value (ie. lists and dicts) and supports nested grains as well. @@ -108,7 +108,7 @@ def list_present(name, value, delimiter=DEFAULT_TARGET_DELIM): :param delimiter: A delimiter different from the default ``:`` can be provided. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 The grain should be `list type `_ @@ -191,7 +191,7 @@ def list_absent(name, value, delimiter=DEFAULT_TARGET_DELIM): :param delimiter: A delimiter different from the default ``:`` can be provided. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 The grain should be `list type `_ @@ -261,13 +261,13 @@ def absent(name, :param force: If force is True, the existing grain will be overwritten regardless of its existing or provided value type. Defaults to False - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param delimiter: A delimiter different from the default can be provided. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 This state now support nested grains and complex values. It is also more conservative: if a grain has a value that is a list or a dict, it will not be removed unless the `force` parameter is True. @@ -355,7 +355,7 @@ def append(name, value, convert=False, :param delimiter: A delimiter different from the default can be provided. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/host.py b/salt/states/host.py index 09a0dff6a4..1c038d36ff 100644 --- a/salt/states/host.py +++ b/salt/states/host.py @@ -149,7 +149,7 @@ def only(name, hostnames): Ensure that only the given hostnames are associated with the given IP address. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 name The IP address to associate with the given hostnames. diff --git a/salt/states/infoblox.py b/salt/states/infoblox.py index f7842b9b73..38e9e59f21 100644 --- a/salt/states/infoblox.py +++ b/salt/states/infoblox.py @@ -4,7 +4,7 @@ states for infoblox stuff ensures a record is either present or absent in an Infoblox DNS system -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' from __future__ import absolute_import diff --git a/salt/states/jenkins.py b/salt/states/jenkins.py index a3356ffb96..b45e65e19b 100644 --- a/salt/states/jenkins.py +++ b/salt/states/jenkins.py @@ -3,7 +3,7 @@ Management of Jenkins ============================== -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' diff --git a/salt/states/k8s.py b/salt/states/k8s.py index 744954b233..879843be17 100644 --- a/salt/states/k8s.py +++ b/salt/states/k8s.py @@ -2,7 +2,7 @@ ''' Manage Kubernetes -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/kmod.py b/salt/states/kmod.py index 7b06b2472f..79306e1b50 100644 --- a/salt/states/kmod.py +++ b/salt/states/kmod.py @@ -66,7 +66,7 @@ def present(name, persist=False, mods=None): ``name`` argument, although still required, is not used, and becomes a placeholder - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if not isinstance(mods, (list, tuple)): mods = [name] @@ -170,7 +170,7 @@ def absent(name, persist=False, comment=True, mods=None): the ``name`` argument, although still required, is not used, and becomes a placeholder - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' if not isinstance(mods, (list, tuple)): mods = [name] diff --git a/salt/states/ldap.py b/salt/states/ldap.py index 90a06f273a..39edc779a8 100644 --- a/salt/states/ldap.py +++ b/salt/states/ldap.py @@ -3,7 +3,7 @@ Manage entries in an LDAP database ================================== -.. versionadded:: Boron +.. versionadded:: 2016.3.0 The ``states.ldap`` state module allows you to manage LDAP entries and their attributes. diff --git a/salt/states/lxc.py b/salt/states/lxc.py index 3b4c7d8c81..3418051116 100644 --- a/salt/states/lxc.py +++ b/salt/states/lxc.py @@ -641,7 +641,7 @@ def created(name, **kwargs): Use :mod:`lxc.present ` ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'The lxc.created state has been renamed to lxc.present, please use ' 'lxc.present' ) @@ -654,7 +654,7 @@ def started(name, path=None, restart=False): Use :mod:`lxc.running ` ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'The lxc.started state has been renamed to lxc.running, please use ' 'lxc.running' ) @@ -673,7 +673,7 @@ def cloned(name, Use :mod:`lxc.present ` ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'The lxc.cloned state has been merged into the lxc.present state. ' 'Please update your states to use lxc.present, with the ' '\'clone_from\' argument set to the name of the clone source.' @@ -744,7 +744,7 @@ def edited_conf(name, lxc_conf=None, lxc_conf_unset=None): - lxc.utsname ''' salt.utils.warn_until( - 'Boron', + 'Carbon', 'This state is unsuitable for setting parameters that appear more ' 'than once in an LXC config file, or parameters which must appear in ' 'a certain order (such as when configuring more than one network ' diff --git a/salt/states/pkg.py b/salt/states/pkg.py index 5981039d9a..e1c100f911 100644 --- a/salt/states/pkg.py +++ b/salt/states/pkg.py @@ -881,7 +881,7 @@ def installed( reinstalled. This is supported in both :mod:`apt ` and :mod:`yumpkg `. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Example: @@ -1949,7 +1949,7 @@ def group_installed(name, skip=None, include=None, **kwargs): - include: - haproxy - .. versionchanged:: Boron + .. versionchanged:: 2016.3.0 This option can no longer be passed as a comma-separated list, it must now be passed as a list (as shown in the above example). diff --git a/salt/states/pkgrepo.py b/salt/states/pkgrepo.py index 7ac1b3df59..71740bd4f5 100644 --- a/salt/states/pkgrepo.py +++ b/salt/states/pkgrepo.py @@ -268,7 +268,7 @@ def managed(name, **kwargs): if kwargs.pop('enabled', None): kwargs['disabled'] = False salt.utils.warn_until( - 'Boron', + 'Carbon', 'The `enabled` argument has been deprecated in favor of ' '`disabled`.' ) diff --git a/salt/states/postgres_initdb.py b/salt/states/postgres_initdb.py index 95f90e0b9d..fdd015e0b0 100644 --- a/salt/states/postgres_initdb.py +++ b/salt/states/postgres_initdb.py @@ -6,7 +6,7 @@ Initialization of PostgreSQL data directory The postgres_initdb module is used to initialize the postgresql data directory. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/postgres_language.py b/salt/states/postgres_language.py index d1bf65438d..813189879f 100644 --- a/salt/states/postgres_language.py +++ b/salt/states/postgres_language.py @@ -6,7 +6,7 @@ Management of PostgreSQL languages The postgres_language module is used to create and manage Postgres languages. Languages can be set as either absent or present -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/postgres_privileges.py b/salt/states/postgres_privileges.py index 8ebbffcdf5..3f12e860e7 100644 --- a/salt/states/postgres_privileges.py +++ b/salt/states/postgres_privileges.py @@ -18,7 +18,7 @@ Privileges can be set on the following database object types: Setting the grant option is supported as well. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/postgres_user.py b/salt/states/postgres_user.py index d00b2f83dd..101c96da63 100644 --- a/salt/states/postgres_user.py +++ b/salt/states/postgres_user.py @@ -96,7 +96,7 @@ def present(name, default_passwoord The password used only when creating the user, unless password is set. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 refresh_password Password refresh flag diff --git a/salt/states/redismod.py b/salt/states/redismod.py index df27e9119f..ae012983cc 100644 --- a/salt/states/redismod.py +++ b/salt/states/redismod.py @@ -121,7 +121,7 @@ def slaveof(name, sentinel_host=None, sentinel_port=None, sentinel_password=None ''' Set this redis instance as a slave. - .. versionadded: Boron + .. versionadded: 2016.3.0 name Master to make this a slave of diff --git a/salt/states/reg.py b/salt/states/reg.py index fd77fd5d3b..48dab97357 100644 --- a/salt/states/reg.py +++ b/salt/states/reg.py @@ -146,7 +146,7 @@ def present(name, .. deprecated:: 2015.8.2 Use `use_32bit_registry` instead. The parameter seems to have no effect since Windows 7 / Windows 2008R2 - removed support for reflection. The parameter will be removed in Boron. + removed support for reflection. The parameter will be removed in Carbon. :param bool use_32bit_registry: Use the 32bit portion of the registry. Applies only to 64bit windows. 32bit Windows will ignore this parameter. @@ -200,7 +200,7 @@ def present(name, vdata = value ret['comment'] = 'State file is using deprecated syntax. Please update.' salt.utils.warn_until( - 'Boron', + 'Carbon', 'The \'value\' argument has been deprecated. ' 'Please use vdata instead.' ) diff --git a/salt/states/rsync.py b/salt/states/rsync.py index 0b542c13e1..bda65aa2eb 100644 --- a/salt/states/rsync.py +++ b/salt/states/rsync.py @@ -16,7 +16,7 @@ ''' Rsync state. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' from __future__ import absolute_import diff --git a/salt/states/saltmod.py b/salt/states/saltmod.py index 2c87afe909..94e2323c97 100644 --- a/salt/states/saltmod.py +++ b/salt/states/saltmod.py @@ -162,11 +162,11 @@ def state( if env is not None: msg = ( 'Passing a salt environment should be done using \'saltenv\' not ' - '\'env\'. This warning will go away in Salt Boron and this ' + '\'env\'. This warning will go away in Salt Carbon and this ' 'will be the default and expected behavior. Please update your ' 'state files.' ) - salt.utils.warn_until('Boron', msg) + salt.utils.warn_until('Carbon', msg) state_ret.setdefault('warnings', []).append(msg) # No need to set __env__ = env since that's done in the state machinery diff --git a/salt/states/selinux.py b/salt/states/selinux.py index 3ae1650396..3931d84b07 100644 --- a/salt/states/selinux.py +++ b/salt/states/selinux.py @@ -64,7 +64,7 @@ def _refine_value(value): def _refine_module_state(module_state): ''' Return a predictable value, or allow us to error out - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' module_state = str(module_state).lower() if module_state in ('1', 'on', 'yes', 'true', 'enabled'): @@ -177,7 +177,7 @@ def module(name, module_state='Enabled', version='any'): Defaults to no preference, set to a specified value if required. Currently can only alert if the version is incorrect. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ret = {'name': name, 'result': True, diff --git a/salt/states/smartos.py b/salt/states/smartos.py index 76aa163008..9815a232c2 100644 --- a/salt/states/smartos.py +++ b/salt/states/smartos.py @@ -7,7 +7,7 @@ Management of SmartOS Standalone Compute Nodes :depends: vmadm, imgadm :platform: smartos -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/splunk.py b/salt/states/splunk.py index 8834c2cee5..e03d140f69 100644 --- a/salt/states/splunk.py +++ b/salt/states/splunk.py @@ -2,7 +2,7 @@ ''' Splunk User State Module -.. versionadded:: Boron. +.. versionadded:: 2016.3.0. This state is used to ensure presence of users in splunk. diff --git a/salt/states/ssh_known_hosts.py b/salt/states/ssh_known_hosts.py index 62f08b5c6a..1a8b9f4069 100644 --- a/salt/states/ssh_known_hosts.py +++ b/salt/states/ssh_known_hosts.py @@ -91,7 +91,7 @@ def present( time anything was read from that host, then the connection is closed and the host in question considered unavailable. Default is 5 seconds. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ret = {'name': name, 'changes': {}, diff --git a/salt/states/telemetry_alert.py b/salt/states/telemetry_alert.py index ccb3bfd7a6..272816621d 100644 --- a/salt/states/telemetry_alert.py +++ b/salt/states/telemetry_alert.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -.. versionadded:: Boron. +.. versionadded:: 2016.3.0. Manage Telemetry alert configurations ===================================== diff --git a/salt/states/virt.py b/salt/states/virt.py index af86febaeb..f7cb41f916 100644 --- a/salt/states/virt.py +++ b/salt/states/virt.py @@ -136,7 +136,7 @@ def stopped(name): ''' Stops a VM by shutting it down nicely. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. code-block:: yaml @@ -151,7 +151,7 @@ def powered_off(name): ''' Stops a VM by power off. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. code-block:: yaml @@ -166,7 +166,7 @@ def running(name, **kwargs): ''' Starts an existing guest, or defines and starts a new VM with specified arguments. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. code-block:: yaml @@ -216,7 +216,7 @@ def snapshot(name, suffix=None): ''' Takes a snapshot of a particular VM or by a UNIX-style wildcard. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. code-block:: yaml @@ -237,7 +237,7 @@ def rebooted(name): ''' Reboots VMs - .. versionadded:: Boron + .. versionadded:: 2016.3.0 :param name: :return: @@ -248,12 +248,12 @@ def rebooted(name): def unpowered(name): ''' - .. deprecated:: Boron + .. deprecated:: 2016.3.0 Use :py:func:`~salt.modules.virt.powered_off` instead. Stops a VM by power off. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. code-block:: yaml @@ -266,12 +266,12 @@ def unpowered(name): def saved(name, suffix=None): ''' - .. deprecated:: Boron + .. deprecated:: 2016.3.0 Use :py:func:`~salt.modules.virt.snapshot` instead. Takes a snapshot of a particular VM or by a UNIX-style wildcard. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. code-block:: yaml @@ -289,11 +289,11 @@ def saved(name, suffix=None): def reverted(name, snapshot=None, cleanup=False): ''' - .. deprecated:: Boron + .. deprecated:: 2016.3.0 Reverts to the particular snapshot. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/win_iis.py b/salt/states/win_iis.py index c0af870283..99b6059997 100644 --- a/salt/states/win_iis.py +++ b/salt/states/win_iis.py @@ -5,7 +5,7 @@ Microsoft IIS site management This module provides the ability to add/remove websites and application pools from Microsoft IIS. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' diff --git a/salt/states/win_system.py b/salt/states/win_system.py index 33a9608d90..cfa9a60558 100644 --- a/salt/states/win_system.py +++ b/salt/states/win_system.py @@ -129,7 +129,7 @@ def computer_name(name): def hostname(name): ''' - .. versionadded:: Boron + .. versionadded:: 2016.3.0 Manage the hostname of the computer diff --git a/salt/states/zcbuildout.py b/salt/states/zcbuildout.py index eacb59c526..a2fec8e2be 100644 --- a/salt/states/zcbuildout.py +++ b/salt/states/zcbuildout.py @@ -6,7 +6,7 @@ Management of zc.buildout This module is inspired from minitage's buildout maker (https://github.com/minitage/minitage/blob/master/src/minitage/core/makers/buildout.py) -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. note:: diff --git a/salt/states/zenoss.py b/salt/states/zenoss.py index 18bf430b19..269599cbe0 100644 --- a/salt/states/zenoss.py +++ b/salt/states/zenoss.py @@ -2,7 +2,7 @@ ''' State to manage monitoring in Zenoss. -.. versionadded:: Boron +.. versionadded:: 2016.3.0 This state module depends on the 'zenoss' Salt execution module. diff --git a/salt/states/zfs.py b/salt/states/zfs.py index 9f42b2a3a9..b9da2478ee 100644 --- a/salt/states/zfs.py +++ b/salt/states/zfs.py @@ -7,7 +7,7 @@ Management zfs datasets :depends: zfs :platform: smartos, illumos, solaris, freebsd, linux -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/states/zpool.py b/salt/states/zpool.py index f79a4ad3e6..690720839f 100644 --- a/salt/states/zpool.py +++ b/salt/states/zpool.py @@ -7,7 +7,7 @@ Management zpool :depends: zpool :platform: smartos, illumos, solaris, freebsd, linux -.. versionadded:: Boron +.. versionadded:: 2016.3.0 .. code-block:: yaml diff --git a/salt/template.py b/salt/template.py index 8ff6b76388..cf04ce3612 100644 --- a/salt/template.py +++ b/salt/template.py @@ -43,11 +43,11 @@ def compile_template(template, ret = {} log.debug('compile template: {0}'.format(template)) - # We "map" env to the same as saltenv until Boron is out in order to follow the same deprecation path + # We "map" env to the same as saltenv until Carbon is out in order to follow the same deprecation path kwargs.setdefault('env', saltenv) salt.utils.warn_until( - 'Boron', - 'We are only supporting \'env\' in the templating context until Boron comes out. ' + 'Carbon', + 'We are only supporting \'env\' in the templating context until Carbon comes out. ' 'Once this warning is shown, please remove the above mapping', _dont_call_warnings=True ) diff --git a/salt/utils/cloud.py b/salt/utils/cloud.py index 8bd3763cdd..75877e178c 100644 --- a/salt/utils/cloud.py +++ b/salt/utils/cloud.py @@ -3113,7 +3113,7 @@ def check_key_path_and_mode(provider, key_path): Returns True or False. - .. versionadded:: Boron + .. versionadded:: 2016.3.0 provider The provider name that the key_path to check belongs to. diff --git a/salt/utils/gitfs.py b/salt/utils/gitfs.py index 10c6562306..3e2ee10c25 100644 --- a/salt/utils/gitfs.py +++ b/salt/utils/gitfs.py @@ -2283,9 +2283,9 @@ class GitFS(GitBase): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -2319,9 +2319,9 @@ class GitFS(GitBase): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -2352,9 +2352,9 @@ class GitFS(GitBase): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') @@ -2424,9 +2424,9 @@ class GitFS(GitBase): ''' if 'env' in load: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) load['saltenv'] = load.pop('env') diff --git a/salt/utils/jid.py b/salt/utils/jid.py index 05b8c58781..79bc5cca97 100644 --- a/salt/utils/jid.py +++ b/salt/utils/jid.py @@ -38,7 +38,7 @@ def jid_dir(jid, cachedir, sum_type): Return the jid_dir for the given job id ''' salt.utils.warn_until( - 'Boron', + 'Carbo', 'All job_cache management has been moved into the local_cache ' 'returner, this util function will be removed-- please use ' 'the returner' @@ -53,7 +53,7 @@ def jid_load(jid, cachedir, sum_type, serial='msgpack'): Return the load data for a given job id ''' salt.utils.warn_until( - 'Boron', + 'Carbo', 'Getting the load has been moved into the returner interface ' 'please get the data from the master_job_cache ' ) diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py index 742f94c61a..25df07d3ed 100644 --- a/salt/utils/jinja.py +++ b/salt/utils/jinja.py @@ -58,10 +58,10 @@ class SaltCacheLoader(BaseLoader): pillar_rend=False): if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/utils/mac_utils.py b/salt/utils/mac_utils.py index 80a7b8450b..24c98ef8a6 100644 --- a/salt/utils/mac_utils.py +++ b/salt/utils/mac_utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' Helper functions for use by mac modules -.. versionadded:: Boron +.. versionadded:: 2016.3.0 ''' from __future__ import absolute_import diff --git a/salt/utils/mako.py b/salt/utils/mako.py index 80ad9d8df5..c4afac66b3 100644 --- a/salt/utils/mako.py +++ b/salt/utils/mako.py @@ -47,10 +47,10 @@ class SaltMakoTemplateLookup(TemplateCollection): def __init__(self, opts, saltenv='base', env=None, pillar_rend=False): if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/utils/master.py b/salt/utils/master.py index eee7f67b5b..63a2f42413 100644 --- a/salt/utils/master.py +++ b/salt/utils/master.py @@ -76,10 +76,10 @@ class MasterPillarUtil(object): env=None): if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' 'not \'env\'. This functionality will be removed in Salt ' - 'Boron.' + 'Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/utils/network.py b/salt/utils/network.py index 847a4ab64e..64f2adb068 100644 --- a/salt/utils/network.py +++ b/salt/utils/network.py @@ -910,13 +910,13 @@ def ip_in_subnet(addr, cidr): ''' Returns True if given IP is within specified subnet, otherwise False - .. deprecated:: Boron + .. deprecated:: Carbo Use :py:func:`~salt.utils.network.in_subnet` instead ''' salt.utils.warn_until( - 'Boron', + 'Carbo', 'Support for \'ip_in_subnet\' has been deprecated and will be removed ' - 'in Salt Boron. Please use \'in_subnet\' instead.' + 'in Salt Carbo. Please use \'in_subnet\' instead.' ) return in_subnet(cidr, addr) diff --git a/salt/utils/openstack/nova.py b/salt/utils/openstack/nova.py index e0591c4a4d..1b98ef77a9 100644 --- a/salt/utils/openstack/nova.py +++ b/salt/utils/openstack/nova.py @@ -980,7 +980,7 @@ class SaltNova(object): ''' List all floating IP pools - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' nt_ks = self.compute_conn pools = nt_ks.floating_ip_pools.list() @@ -995,7 +995,7 @@ class SaltNova(object): ''' List floating IPs - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' nt_ks = self.compute_conn floating_ips = nt_ks.floating_ips.list() @@ -1014,7 +1014,7 @@ class SaltNova(object): ''' Show info on specific floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' nt_ks = self.compute_conn floating_ips = nt_ks.floating_ips.list() @@ -1027,7 +1027,7 @@ class SaltNova(object): ''' Allocate a floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' nt_ks = self.compute_conn floating_ip = nt_ks.floating_ips.create(pool) @@ -1044,7 +1044,7 @@ class SaltNova(object): ''' De-allocate a floating IP - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' ip = self.floating_ip_show(floating_ip) nt_ks = self.compute_conn @@ -1054,7 +1054,7 @@ class SaltNova(object): ''' Associate floating IP address to server - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' nt_ks = self.compute_conn server_ = self.server_by_name(server_name) @@ -1066,7 +1066,7 @@ class SaltNova(object): ''' Disassociate a floating IP from server - .. versionadded:: Boron + .. versionadded:: 2016.3.0 ''' nt_ks = self.compute_conn server_ = self.server_by_name(server_name) diff --git a/salt/utils/pushover.py b/salt/utils/pushover.py index d6a27ad067..b242e2aaf5 100644 --- a/salt/utils/pushover.py +++ b/salt/utils/pushover.py @@ -2,7 +2,7 @@ ''' Library for interacting with Slack API -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :configuration: This module can be used by specifying the name of a configuration profile in the minion config, minion pillar, or master diff --git a/salt/utils/pydsl.py b/salt/utils/pydsl.py index 388ebc6798..570e1ded1f 100644 --- a/salt/utils/pydsl.py +++ b/salt/utils/pydsl.py @@ -141,9 +141,9 @@ class Sls(object): def include(self, *sls_names, **kws): if kws.get('env', None) is not None: warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility kws['saltenv'] = kws.pop('env') diff --git a/salt/utils/slack.py b/salt/utils/slack.py index 53460258f9..63af9c182d 100644 --- a/salt/utils/slack.py +++ b/salt/utils/slack.py @@ -2,7 +2,7 @@ ''' Library for interacting with Slack API -.. versionadded:: Boron +.. versionadded:: 2016.3.0 :configuration: This module can be used by specifying the name of a configuration profile in the minion config, minion pillar, or master diff --git a/salt/utils/url.py b/salt/utils/url.py index f03fc8a1ba..1ddf0762a1 100644 --- a/salt/utils/url.py +++ b/salt/utils/url.py @@ -26,9 +26,9 @@ def parse(url): if '?env=' in resource: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) path, saltenv = resource.split('?env=', 1) elif '?saltenv=' in resource: diff --git a/salt/wheel/file_roots.py b/salt/wheel/file_roots.py index af252ecf2f..aef90fbd15 100644 --- a/salt/wheel/file_roots.py +++ b/salt/wheel/file_roots.py @@ -20,9 +20,9 @@ def find(path, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -49,9 +49,9 @@ def list_env(saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -99,9 +99,9 @@ def read(path, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -125,9 +125,9 @@ def write(data, path, saltenv='base', index=0, env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env diff --git a/salt/wheel/pillar_roots.py b/salt/wheel/pillar_roots.py index 5e8728bc19..c336e035cd 100644 --- a/salt/wheel/pillar_roots.py +++ b/salt/wheel/pillar_roots.py @@ -21,9 +21,9 @@ def find(path, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -50,9 +50,9 @@ def list_env(saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -100,9 +100,9 @@ def read(path, saltenv='base', env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env @@ -126,9 +126,9 @@ def write(data, path, saltenv='base', index=0, env=None): ''' if env is not None: salt.utils.warn_until( - 'Boron', + 'Carbon', 'Passing a salt environment should be done using \'saltenv\' ' - 'not \'env\'. This functionality will be removed in Salt Boron.' + 'not \'env\'. This functionality will be removed in Salt Carbon.' ) # Backwards compatibility saltenv = env diff --git a/setup.py b/setup.py index 00acaa066b..164b92116e 100755 --- a/setup.py +++ b/setup.py @@ -690,8 +690,8 @@ class Install(install): def initialize_options(self): install.initialize_options(self) # pylint: disable=undefined-variable - if __saltstack_version__.info >= SaltStackVersion.from_name('Boron'): - # XXX: Remove the Salt Specific Options In Salt Boron. They are now global options + if __saltstack_version__.info >= SaltStackVersion.from_name('Carbon'): + # XXX: Remove the Salt Specific Options In Salt Carbon. They are now global options raise DistutilsArgError( 'Developers, please remove the salt paths configuration ' 'setting from the setup\'s install command' @@ -725,7 +725,7 @@ class Install(install): log.warn( 'The \'--salt-{0}\' setting is now a global option just pass it ' 'right after \'setup.py\'. This install setting will still work ' - 'until Salt Boron but please migrate to the global setting as ' + 'until Salt Carbon but please migrate to the global setting as ' 'soon as possible.'.format( optname.replace('_', '-') ) @@ -736,7 +736,7 @@ class Install(install): 'The \'--salt-{0}\' setting was passed as a global option ' 'and as an option to the install command. Please only pass ' 'one of them, preferrably the global option since the other ' - 'is now deprecated and will be removed in Salt Boron.'.format( + 'is now deprecated and will be removed in Salt Carbon.'.format( optname.replace('_', '-') ) ) diff --git a/tests/integration/states/compiler.py b/tests/integration/states/compiler.py index 101b669bb9..8a6b24beb4 100644 --- a/tests/integration/states/compiler.py +++ b/tests/integration/states/compiler.py @@ -41,8 +41,8 @@ class CompileTest(integration.ModuleCase): def test_env_in_jinja_context(self): salt.utils.warn_until( - 'Boron', - 'We are only supporting \'env\' in the templating context until Boron comes out. ' + 'Carbon', + 'We are only supporting \'env\' in the templating context until Carbon comes out. ' 'Once this warning is show, please remove the test case', _dont_call_warnings=True ) From 7e40a97a24f4d7a49b7b783ef3f7d31e1004ce4b Mon Sep 17 00:00:00 2001 From: rallytime Date: Wed, 10 Feb 2016 16:26:56 -0700 Subject: [PATCH 2/2] Carbo --> Carbon --- salt/utils/jid.py | 4 ++-- salt/utils/network.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/salt/utils/jid.py b/salt/utils/jid.py index 79bc5cca97..9284520d63 100644 --- a/salt/utils/jid.py +++ b/salt/utils/jid.py @@ -38,7 +38,7 @@ def jid_dir(jid, cachedir, sum_type): Return the jid_dir for the given job id ''' salt.utils.warn_until( - 'Carbo', + 'Carbon', 'All job_cache management has been moved into the local_cache ' 'returner, this util function will be removed-- please use ' 'the returner' @@ -53,7 +53,7 @@ def jid_load(jid, cachedir, sum_type, serial='msgpack'): Return the load data for a given job id ''' salt.utils.warn_until( - 'Carbo', + 'Carbon', 'Getting the load has been moved into the returner interface ' 'please get the data from the master_job_cache ' ) diff --git a/salt/utils/network.py b/salt/utils/network.py index 64f2adb068..ec13db6aae 100644 --- a/salt/utils/network.py +++ b/salt/utils/network.py @@ -910,13 +910,13 @@ def ip_in_subnet(addr, cidr): ''' Returns True if given IP is within specified subnet, otherwise False - .. deprecated:: Carbo + .. deprecated:: Carbon Use :py:func:`~salt.utils.network.in_subnet` instead ''' salt.utils.warn_until( - 'Carbo', + 'Carbon', 'Support for \'ip_in_subnet\' has been deprecated and will be removed ' - 'in Salt Carbo. Please use \'in_subnet\' instead.' + 'in Salt Carbon. Please use \'in_subnet\' instead.' ) return in_subnet(cidr, addr)