Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop:
  Remove known issues section for rc2 (saltstack#37569)
  Update release candidate docs with RC2 info (saltstack#37564)
  sqlite is not found in 2015.8 (saltstack#37549)
  Added pillar_enc variable to orchestrate to be passed through

doc/topics/releases/2016.11.0.rst

@@ -10,16 +10,6 @@ Release Candidate
 See :ref:`Installing/Testing a Salt Release Candidate <release-candidate>` for instructions to install the
 latest release candidate.
 
-Release Candidate Known Issues
-------------------------------
-
-- :issue:`36729`: Minion does not shutdown properly when attempting to start multiple minions on same host
-- :issue:`36693`: /etc/salt/master.d/schedule.conf schedule jobs fail to run
-- :issue:`36746`: When killing a job jid output missing
-- :issue:`36748`: Proxy minion is not working
-- :issue:`36134`: multi-master with failover does not failover when master goes down
-- :issue:`36804`: error when using pkg.installed with url source
-
 New Features
 ============
 

doc/topics/releases/releasecandidate.rst

@@ -8,8 +8,8 @@ Installing/Testing a Salt Release Candidate
 
 It's time for a new feature release of Salt! Follow the instructions below to
 install the latest release candidate of Salt, and try :doc:`all the shiny new
-features </topics/releases/carbon>`! Be sure to report any bugs you find on `Github
-<https://github.com/saltstack/salt/issues/new/>`_.
+features </topics/releases/2016.11.0>`! Be sure to report any bugs you find on
+`Github <https://github.com/saltstack/salt/issues/new/>`_.
 
 Installing Using Packages
 =========================
@@ -32,29 +32,31 @@ Builds for a few platforms are available as part of the RC at https://repo.salts
 
 Available builds:
 
-- Windows
-- Mac OS X
+- Amazon Linux
+- Debian 8
+- macOS
 - RHEL 7
 - Ubuntu 16.04
-- Debian 8
-- FreeBSD
-- SmartOS (see below)
+- Windows
 
-SmartOS
--------
-Release candidate builds for SmartOS are available at http://pkg.blackdot.be/extras/salt-2016.11rc/.
+.. SmartOS (see below)
+.. FreeBSD
 
-On a base64 2015Q4-x86_64 based native zone the package can be installed by the following:
+.. SmartOS
+   -------
+   Release candidate builds for SmartOS are available at http://pkg.blackdot.be/extras/salt-2016.11rc/.
 
-.. code-block:: bash
+.. On a base64 2015Q4-x86_64 based native zone the package can be installed by the following:
 
-    pfexec pkg_add -U http://pkg.blackdot.be/extras/salt-2016.11rc/salt-2016.11.0rc1_2015Q4_x86_64.tgz
+.. .. code-block:: bash
 
-When using the 2016Q2-tools release on the global zone by the following:
+..    pfexec pkg_add -U http://pkg.blackdot.be/extras/salt-2016.11rc/salt-2016.11.0rc1_2015Q4_x86_64.tgz
 
-.. code-block:: bash
+.. When using the 2016Q2-tools release on the global zone by the following:
+
+.. .. code-block:: bash
 
-    pfexec pkg_add -U http://pkg.blackdot.be/extras/salt-2016.11rc/salt-2016.11.0rc1_2016Q2_TOOLS.tgz
+..    pfexec pkg_add -U http://pkg.blackdot.be/extras/salt-2016.11rc/salt-2016.11.0rc1_2016Q2_TOOLS.tgz
 
 Installing Using Bootstrap
 ==========================
@@ -65,28 +67,28 @@ You can install a release candidate of Salt using `Salt Bootstrap
 .. code-block:: bash
 
     curl -o install_salt.sh -L https://bootstrap.saltstack.com
-    sudo sh install_salt.sh -P git v2016.11.0rc1
+    sudo sh install_salt.sh -P git v2016.11.0rc2
 
 If you want to also install a master using Salt Bootstrap, use the ``-M`` flag:
 
 .. code-block:: bash
 
     curl -o install_salt.sh -L https://bootstrap.saltstack.com
-    sudo sh install_salt.sh -P -M git v2016.11.0rc1
+    sudo sh install_salt.sh -P -M git v2016.11.0rc2
 
 If you want to install only a master and not a minion using Salt Bootstrap, use
 the ``-M`` and ``-N`` flags:
 
 .. code-block:: bash
 
     curl -o install_salt.sh -L https://bootstrap.saltstack.com
-    sudo sh install_salt.sh -P -M -N git v2016.11.0rc1
+    sudo sh install_salt.sh -P -M -N git v2016.11.0rc2
 
 Installing Using PyPI
 =====================
 
 Installing from the `source archive
-<https://pypi.python.org/packages/source/s/salt/salt-v2016.11.0rc1.tar.gz>`_ on
+<https://pypi.python.org/packages/7a/87/3b29ac215208bed9559d6c4df24175ddd1d52e62c5c00ae3afb3b7d9144d/salt-2016.11.0rc2.tar.gz>`_ on
 `PyPI <https://pypi.python.org/pypi>`_ is fairly straightforward.
 
 .. note::
@@ -124,4 +126,4 @@ Then install salt using the following command:
 
 .. code-block:: bash
 
-    sudo pip install salt==v2016.11.0rc1
+    sudo pip install salt==v2016.11.0rc2

salt/runners/state.py

@@ -21,6 +21,7 @@ def orchestrate(mods,
                 exclude=None,
                 pillar=None,
                 pillarenv=None,
+                pillar_enc=None,
                 orchestration_jid=None):
     '''
     .. versionadded:: 0.17.0
@@ -48,6 +49,21 @@ def orchestrate(mods,
     .. versionchanged:: 2014.7.0
 
         Runner uses the pillar variable
+
+    .. versionchanged:: develop
+
+        Runner uses the pillar_enc variable that allows renderers to render the pillar.
+        This is usable when supplying the contents of a file as pillar, and the file contains
+        gpg-encrypted entries.
+
+    .. seealso:: GPG renderer documentation
+
+    CLI Examples:
+
+    .. code-block:: bash
+
+       salt-run state.orchestrate webserver pillar_enc=gpg pillar="$(cat somefile.json)"
+
     '''
     if pillar is not None and not isinstance(pillar, dict):
         raise SaltInvocationError(
@@ -62,6 +78,7 @@ def orchestrate(mods,
             exclude,
             pillar=pillar,
             pillarenv=pillarenv,
+            pillar_enc=pillar_enc,
             orchestration_jid=orchestration_jid)
     ret = {'data': {minion.opts['id']: running}, 'outputter': 'highstate'}
     res = salt.utils.check_state_result(ret['data'])

salt/states/sqlite3.py

@@ -5,7 +5,7 @@
 
 :depends:   - SQLite3 Python Module
 :configuration: See :py:mod:`salt.modules.sqlite3` for setup instructions
-.. versionadded:: Beryllium
+.. versionadded:: 2016.3.0
 
 The sqlite3 module is used to create and manage sqlite3 databases
 and execute queries