First attempt at adding reinstall logic to pkg.install for yumpkg module
First attempt at adding reinstall logic to pkg.install for yumpkg module
Merge branch 'develop' into pkg.install-reinstall
First attempt at adding reinstall logic to pkg.install for yumpkg module
states.iptables support custom rule filename to save
Added _in_pkg_dict() helper function to enable reinstall functionality for versioned package names and for sources.  Also fixed return data for reinstall of versioned package name.
Fixed pylint violations
Fixed potential unbalanced tuple unpacking
normalized keep data so use uid
Adds support for OrderedDicts in jinja templates.
Adds support for OrderedDicts in jinja templates.
Changed OrderedDict provider to salt.utils.odict for backwards compat with py2.6
Removes unnecessary collections import.
update tests to handle new return data from states
Fix for python 3 indexing exceptions
Merge pull request #12787 from rallytime/pylint_fix

Fix for python 3 indexing exceptions
Fixed incorrect documentation on the master/client config functions

Fleshed out the function docstrings and pulled those into the Python API
docs.
Reorganized the Python API docs to be more Python-centric
Merge pull request #12608 from jond64/pkg.install-reinstall

Pkg.install reinstall
Merge pull request #12796 from gtmanfred/develop

don't error if the server doesn't have a progress