Merge pull request #39317 from rallytime/merge-2016.11

[2016.11] Merge forward from 2016.3 to 2016.11

doc/Makefile

@@ -217,7 +217,6 @@ pseudoxml: translations
 	@echo
 	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
 
-
 translations:
 	@if [ "$(SPHINXLANG)" = "en" ] || [ "x$(SPHINXLANG)" = "x" ]; then \
 		echo "No need to update translations. Skipping..."; \

doc/topics/development/hacking.rst

@@ -243,10 +243,10 @@ You can now call all of Salt's CLI tools without explicitly passing the configur
 Additional Options
 ..................
 
-In case you want to distribute your virtualenv, you probably don't want to
-include Salt's clone ``.git/`` directory, and, without it, Salt won't report
-the accurate version. You can tell ``setup.py`` to generate the hardcoded
-version information which is distributable:
+If you want to distribute your virtualenv, you probably don't want to include
+Salt's clone ``.git/`` directory, and, without it, Salt won't report the
+accurate version. You can tell ``setup.py`` to generate the hardcoded version
+information which is distributable:
 
 .. code-block:: bash
 

doc/topics/proxyminion/index.rst

@@ -364,7 +364,8 @@ Pre 2015.8 the proxymodule also must have an ``id()`` function.  2015.8 and foll
 this function because the proxy's id is required on the command line.
 
 Here is an example proxymodule used to interface to a *very* simple REST
-server.  Code for the server is in the `salt-contrib GitHub repository <https://github.com/saltstack/salt-contrib/proxyminion_rest_example>`_
+server.  Code for the server is in the `salt-contrib GitHub repository
+<https://github.com/saltstack/salt-contrib/tree/master/proxyminion_rest_example>`_
 
 This proxymodule enables "service" enumeration, starting, stopping, restarting,
 and status; "package" installation, and a ping.

doc/topics/tutorials/writing_tests.rst

@@ -338,7 +338,7 @@ call should return.
                 alias='fred')
         self.assertEqual(tgt_ret, 'bob')
 
-Using multiple Salt commands in this manor provides two useful benefits. The first is
+Using multiple Salt commands in this manner provides two useful benefits. The first is
 that it provides some additional coverage for the ``aliases.set_target`` function.
 The second benefit is the call to ``aliases.get_target`` is not dependent on the
 presence of any aliases set outside of this test. Tests should not be dependent on

salt/modules/file.py

@@ -1538,7 +1538,7 @@ def _get_line_indent(src, line, indent):
     '''
     Indent the line with the source line.
     '''
-    if not (indent or line):
+    if not indent:
         return line
 
     idt = []
@@ -1741,7 +1741,6 @@ def line(path, content, match=None, mode=None, location=None,
     elif mode == 'ensure':
         after = after and after.strip()
         before = before and before.strip()
-        content = content and content.strip()
 
         if before and after:
             _assert_occurrence(body, before, 'before')

salt/pillar/__init__.py

@@ -349,11 +349,14 @@ class Pillar(object):
             opts['grains'] = {}
         else:
             opts['grains'] = grains
-        if not opts.get('environment'):
-            opts['environment'] = saltenv
+        # Allow minion/CLI saltenv/pillarenv to take precedence over master
+        opts['environment'] = saltenv \
+            if saltenv is not None \
+            else opts.get('environment')
+        opts['pillarenv'] = pillarenv \
+            if pillarenv is not None \
+            else opts.get('pillarenv')
         opts['id'] = self.minion_id
-        if not opts.get('pillarenv'):
-            opts['pillarenv'] = pillarenv
         if opts['state_top'].startswith('salt://'):
             opts['state_top'] = opts['state_top']
         elif opts['state_top'].startswith('/'):

salt/returners/pgjsonb.py

@@ -3,10 +3,21 @@
 Return data to a PostgreSQL server with json data stored in Pg's jsonb data type
 
 :maintainer:    Dave Boucha <dave@saltstack.com>, Seth House <shouse@saltstack.com>, C. R. Oldham <cr@saltstack.com>
-:maturity:      new
+:maturity:      Stable
 :depends:       python-psycopg2
 :platform:      all
 
+.. note::
+    There are three PostgreSQL returners.  Any can function as an external
+    :ref:`master job cache <external-master-cache>`. but each has different
+    features.  SaltStack recommends
+    :mod:`returners.pgjsonb <salt.returners.pgjsonb>` if you are working with
+    a version of PostgreSQL that has the appropriate native binary JSON types.
+    Otherwise, review
+    :mod:`returners.postgres <salt.returners.postgres>` and
+    :mod:`returners.postgres_local_cache <salt.returners.postgres_local_cache>`
+    to see which module best suits your particular needs.
+
 To enable this returner, the minion will need the python client for PostgreSQL
 installed and the following values configured in the minion or master
 config. These are the defaults:

salt/returners/postgres.py

@@ -3,11 +3,15 @@
 Return data to a postgresql server
 
 .. note::
+    There are three PostgreSQL returners.  Any can function as an external
+    :ref:`master job cache <external-master-cache>`. but each has different
+    features.  SaltStack recommends
+    :mod:`returners.pgjsonb <salt.returners.pgjsonb>` if you are working with
+    a version of PostgreSQL that has the appropriate native binary JSON types.
+    Otherwise, review
+    :mod:`returners.postgres <salt.returners.postgres>` and
     :mod:`returners.postgres_local_cache <salt.returners.postgres_local_cache>`
-    is recommended instead of this module when using PostgreSQL as a
-    :ref:`master job cache <external-job-cache>`. These two modules
-    provide different functionality so you should compare each to see which
-    module best suits your particular needs.
+    to see which module best suits your particular needs.
 
 :maintainer:    None
 :maturity:      New

salt/returners/postgres_local_cache.py

@@ -4,14 +4,18 @@ Use a postgresql server for the master job cache. This helps the job cache to
 cope with scale.
 
 .. note::
-    :mod:`returners.postgres <salt.returners.postgres>` is also available if
-    you are not using PostgreSQL as a :ref:`master job cache
-    <external-job-cache>`.  These two modules provide different
-    functionality so you should compare each to see which module best suits
-    your particular needs.
+    There are three PostgreSQL returners.  Any can function as an external
+    :ref:`master job cache <external-job-cache>`. but each has different
+    features.  SaltStack recommends
+    :mod:`returners.pgjsonb <salt.returners.pgjsonb>` if you are working with
+    a version of PostgreSQL that has the appropriate native binary JSON types.
+    Otherwise, review
+    :mod:`returners.postgres <salt.returners.postgres>` and
+    :mod:`returners.postgres_local_cache <salt.returners.postgres_local_cache>`
+    to see which module best suits your particular needs.
 
 :maintainer:    gjredelinghuys@gmail.com
-:maturity:      New
+:maturity:      Stable
 :depends:       psycopg2
 :platform:      all
 

salt/utils/gitfs.py

@@ -1704,6 +1704,11 @@ class Dulwich(GitProvider):  # pylint: disable=abstract-method
     '''
     def __init__(self, opts, remote, per_remote_defaults, per_remote_only,
                  override_params, cache_root, role='gitfs'):
+        salt.utils.warn_until(
+            'Nitrogen',
+            'Dulwich will no longer be supported for {0} beginning in the '
+            'Nitrogen release of Salt.'.format(role)
+        )
         self.get_env_refs = lambda refs: [
             x for x in refs if re.match('refs/(remotes|tags)', x)
             and not x.endswith('^{}')