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

* upstream/develop: (53 commits)
  Add CLI Examples for functions in the namecheap_ns execution module
  update adml text search to use 'starts-with' as some policies text has trailing spaces
  Fix saltstack#38775
  Adding unless-stopped as an option to restart policy.
  pillar/file_tree.py: Data read from files is now passed through the compile_template_str-function before being put into the pillar. Default renderer pipeline, as well as renderer blacklist and renderer whitelist can be configured from the salt master config.
  Fix Lint
  renderers/gpg.py: Pylint fixes
  renderers/gpg.py: Added check and workaround if data is of type cStringIO.InputType (which it is when handed from template.py)
  Add solrcloud module
  pep8
  No mutable default args, remove unneeded import
  DOCS: correct examples of running test suite
  DOCS: add links to File State Backups page where necessary (saltstack#38735)
  Pylint fix
  Proofread jinja_to_execution_module tutorial (saltstack#38720)
  Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py
  Fix for dynamic git_pillar when pillarenv is used
  Add NameError to exception in avahi_announce beacon
  The `test` option is only valid for the minion, not the master
  Localfs should also be changed of course
  ...

conf/master

@@ -400,7 +400,7 @@
 # Pass in an alternative location for the salt-ssh roster file
 #roster_file: /etc/salt/roster
 
-# Define a locations for roster files so they can be chosen when using Salt API.
+# Define a location for roster files so they can be chosen when using Salt API.
 # An administrator can place roster files into these locations. Then when
 # calling Salt API, parameter 'roster_file' should contain a relative path to
 # these locations. That is, "roster_file=/foo/roster" will be resolved as

doc/ref/configuration/master.rst

@@ -1348,22 +1348,6 @@ Enable extra routines for YAML renderer used states containing UTF characters.
 
     yaml_utf8: False
 
-.. conf_master:: test
-
-``test``
---------
-
-Default: ``False``
-
-Set all state calls to only test if they are going to actually make changes
-or just post what changes are going to be made.
-
-.. code-block:: yaml
-
-    test: False
-
-.. conf_master:: runner_returns
-
 ``runner_returns``
 ------------------
 

doc/ref/configuration/minion.rst

@@ -608,7 +608,9 @@ The directory where Unix sockets will be kept.
 
 Default: ``''``
 
-Backup files replaced by file.managed and file.recurse under cachedir.
+Make backups of files replaced by ``file.managed`` and ``file.recurse`` state modules under
+:conf_minion:`cachedir` in ``file_backup`` subdirectory preserving original paths.
+Refer to :ref:`File State Backups documentation <file-state-backups>` for more details.
 
 .. code-block:: yaml
 
@@ -1198,6 +1200,20 @@ The default renderer used for local state executions
 
     renderer: yaml_jinja
 
+.. conf_master:: test
+
+``test``
+--------
+
+Default: ``False``
+
+Set all state calls to only test if they are going to actually make changes
+or just post what changes are going to be made.
+
+.. code-block:: yaml
+
+    test: False
+
 .. conf_minion:: state_verbose
 
 ``state_verbose``

doc/topics/development/tests/index.rst

@@ -139,13 +139,13 @@ Running Test Subsections
 Instead of running the entire test suite all at once, which can take a long time,
 there are several ways to run only specific groups of tests or individual tests:
 
-* Run unit tests only: ``./tests/runtests.py --unit-tests``
-* Run unit and integration tests for states: ``./tests/runtests.py --state``
-* Run integration tests for an individual module: ``./tests/runtests.py -n integration.modules.virt``
-* Run unit tests for an individual module: ``./tests/runtests.py -n unit.modules.virt_test``
+* Run :ref:`unit tests only<running-unit-tests-no-daemons>`: ``python tests/runtests.py --unit-tests``
+* Run unit and integration tests for states: ``python tests/runtests.py --state``
+* Run integration tests for an individual module: ``python tests/runtests.py -n integration.modules.virt``
+* Run unit tests for an individual module: ``python tests/runtests.py -n unit.modules.virt_test``
 * Run an individual test by using the class and test name (this example is for the
   ``test_default_kvm_profile`` test in the ``integration.module.virt``):
-  ``./tests/runtests.py -n integration.module.virt.VirtTest.test_default_kvm_profile``
+  ``python tests/runtests.py -n integration.module.virt.VirtTest.test_default_kvm_profile``
 
 For more specific examples of how to run various test subsections or individual
 tests, please see the :ref:`Test Selection Options <test-selection-options>`
@@ -163,14 +163,14 @@ Since the unit tests do not require a master or minion to execute, it is often u
 run unit tests individually, or as a whole group, without having to start up the integration testing
 daemons. Starting up the master, minion, and syndic daemons takes a lot of time before the tests can
 even start running and is unnecessary to run unit tests. To run unit tests without invoking the
-integration test daemons, simple remove the ``/tests`` portion of the ``runtests.py`` command:
+integration test daemons, simply run the ``runtests.py`` script with ``--unit`` argument:
 
 .. code-block:: bash
 
-    ./runtests.py --unit
+    python tests/runtests.py --unit
 
-All of the other options to run individual tests, entire classes of tests, or entire test modules still
-apply.
+All of the other options to run individual tests, entire classes of tests, or
+entire test modules still apply.
 
 
 Running Destructive Integration Tests
@@ -191,13 +191,14 @@ successfully. Therefore, running destructive tests should be done with caution.
 
 .. note::
 
-    Running destructive tests will change the underlying system. Use caution when running destructive tests.
+    Running destructive tests will change the underlying system.
+    Use caution when running destructive tests.
 
 To run tests marked as destructive, set the ``--run-destructive`` flag:
 
 .. code-block:: bash
 
-    ./tests/runtests.py --run-destructive
+    python tests/runtests.py --run-destructive
 
 
 Running Cloud Provider Tests
@@ -259,13 +260,13 @@ Here's a simple usage example:
 
 .. code-block:: bash
 
-    tests/runtests.py --docked=ubuntu-12.04 -v
+    python tests/runtests.py --docked=ubuntu-12.04 -v
 
 The full `docker`_ container repository can also be provided:
 
 .. code-block:: bash
 
-    tests/runtests.py --docked=salttest/ubuntu-12.04 -v
+    python tests/runtests.py --docked=salttest/ubuntu-12.04 -v
 
 
 The SaltStack team is creating some containers which will have the necessary

doc/topics/installation/ubuntu.rst

@@ -14,11 +14,7 @@ are available in the SaltStack repository.
 
 Instructions are at https://repo.saltstack.com/#ubuntu.
 
-Installation from the Community-Maintained Repository
-=====================================================
-
-The PPA is no longer maintained, and shouldn't be used. Please use the Official 
-Salt Stack repository instead.
+.. _ubuntu-install-pkgs:
 
 Install Packages
 ================

doc/topics/netapi/index.rst

@@ -38,7 +38,7 @@ simply by creating a data structure. (And this is exactly how much of Salt's
 own internals work!)
 
 .. autoclass:: salt.netapi.NetapiClient
-    :members: local, local_async, local_batch, local_subset, ssh, ssh_async, 
+    :members: local, local_async, local_subset, ssh, ssh_async, 
         runner, runner_async, wheel, wheel_async
 
 .. toctree::

doc/topics/releases/2015.8.13.rst

@@ -0,0 +1,31 @@
+============================
+Salt 2015.8.13 Release Notes
+============================
+
+Version 2015.8.13 is a bugfix release for :ref:`2015.8.0 <release-2015-8-0>`.
+
+
+Changes for v2015.8.12..v2015.8.13
+----------------------------------
+
+Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
+
+*Generated at: 2017-01-09T21:17:06Z*
+
+Statistics:
+
+- Total Merges: **3**
+- Total Issue references: **3**
+- Total PR references: **5**
+
+Changes:
+
+* 3428232 Clean up tests and docs for batch execution
+* 3d8f3d1 Remove batch execution from NetapiClient and Saltnado
+* 97b0f64 Lintfix
+* d151666 Add explanation comment
+* 62f2c87 Add docstring
+* 9b0a786 Explain what it is about and how to configure that
+* 5ea3579 Pick up a specified roster file from the configured locations
+* 3a8614c Disable custom rosters in API
+* c0e5a11 Add roster disable flag

doc/topics/tutorials/jinja_to_execution_module.rst

@@ -58,7 +58,7 @@ Unfortunately, it can lead to code that looks like the following.
     {% endfor %}
 
 This is an example from the author's salt formulae demonstrating misuse of jinja.
-Aside from being difficult to read and maintian,
+Aside from being difficult to read and maintain,
 accessing the logic it contains from a non-jinja renderer
 while probably possible is a significant barrier!
 
@@ -158,6 +158,6 @@ Conclusion
 ----------
 
 That was... surprisingly straight-forward.
-Now the logic is now available in every renderer, instead of just Jinja.
+Now the logic is available in every renderer, instead of just Jinja.
 Best of all, it can be maintained in Python,
 which is a whole lot easier than Jinja.

pkg/windows/req.txt

@@ -11,7 +11,7 @@ idna==2.1
 ioflo==1.5.5
 ioloop==0.1a0
 ipaddress==1.0.16
-Jinja2==2.8
+Jinja2==2.9.4
 libnacl==1.4.5
 lxml==3.6.0
 Mako==1.0.4

salt/beacons/avahi_announce.py

@@ -32,7 +32,7 @@
     GROUP = dbus.Interface(BUS.get_object(avahi.DBUS_NAME, SERVER.EntryGroupNew()),
                            avahi.DBUS_INTERFACE_ENTRY_GROUP)
     HAS_DBUS = True
-except ImportError:
+except (ImportError, NameError):
     HAS_DBUS = False
 except DBusException:
     HAS_DBUS = False

salt/cache/__init__.py

@@ -206,7 +206,7 @@ def list(self, bank):
             Raises an exception if cache driver detected an error accessing data
             in the cache backend (auth, permissions, etc).
         '''
-        fun = '{0}.{1}'.format(self.driver, 'list')
+        fun = '{0}.{1}'.format(self.driver, 'getlist')
         return self.modules[fun](bank)
 
     def contains(self, bank, key=None):

salt/cache/consul.py

@@ -129,7 +129,7 @@ def flush(bank, key=None):
         )
 
 
-def list(bank):
+def getlist(bank):
     '''
     Return an iterable object containing all entries stored in the specified bank.
     '''

salt/cache/localfs.py

@@ -112,7 +112,7 @@ def flush(bank, key=None):
     return True
 
 
-def list(bank):
+def getlist(bank):
     '''
     Return an iterable object containing all entries stored in the specified bank.
     '''

salt/cloud/clouds/nova.py

@@ -48,6 +48,25 @@
       driver: nova
       userdata_file: /tmp/userdata.txt
 
+To use keystoneauth1 instead of keystoneclient, include the `use_keystoneauth`
+option in the provider config.
+
+.. note:: this is required to use keystone v3 as for authentication.
+
+.. code-block:: yaml
+
+    my-openstack-config:
+      use_keystoneauth: True
+      identity_url: 'https://controller:5000/v3'
+      auth_version: 3
+      compute_name: nova
+      compute_region: RegionOne
+      service_type: compute
+      tenant: admin
+      user: admin
+      password: passwordgoeshere
+      driver: nova
+
 For local installations that only use private IP address ranges, the
 following option may be useful. Using the old syntax:
 
@@ -279,6 +298,7 @@ def get_conn():
     kwargs['project_id'] = vm_['tenant']
     kwargs['auth_url'] = vm_['identity_url']
     kwargs['region_name'] = vm_['compute_region']
+    kwargs['use_keystoneauth'] = vm_['use_keystoneauth']
 
     if 'password' in vm_:
         kwargs['password'] = vm_['password']