Change all relevant Boron references to 2016.3.0

And more Boron deprecation warnings to Carbon

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.

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

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``
 

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.
 

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:

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

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.

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...>

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

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
 ==============================

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
 -------

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

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

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

salt/beacons/memusage.py

@@ -2,7 +2,7 @@
 '''
 Beacon to monitor memory usage.
 
-.. versionadded:: Boron
+.. versionadded:: 2016.3.0
 
 :depends: python-psutil
 '''

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

salt/client/mixins.py

@@ -329,7 +329,7 @@ def low(self, fun, low):
                 # kwargs using the old mechanism
                 if kwargs:
                     salt.utils.warn_until(
-                        'Boron',
+                        'Carbon',
                         'kwargs must be passed inside the low under "kwargs"'
                     )
             else:

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

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:
 

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

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(