I don't always write docstrings, but when I do, sometimes I only write half of them and then I feel silly. :-/
Debian sets COLUMNS in base env which will truncate ps output

Fixes #5646
git_pillar: Don't merge updates

When updating the local cached repository don't try to pull/merge the
changes as the operation will fail if merge conflicts exist.  We only
want to mirror what's in the remote repository.
fix intentation in lxc module
Add a line per pylint
Fix spacing per pylint
Documentation clarification to make the explanation of /etc/salt/grains more specific.
When the minion refreshes its grains, it should also refresh its pillars so that it can fire an event back to the master to inform it of its new state. Refs #5737.
In-line documentation to remind the reader that some pre-processing of minion targets occurs on the master.
Added Saltconf banner to docs sidebar
Fix state compiler stack trace, github issue #5767
Merge pull request #7931 from cro/develop

Fix state compiler stack trace, github issue #5767
Update build_rule to ignore __env__, __sls__, order

The rules not created without these switches in the iptables command.
Add a salt runner that safely accepts minion keys using salt-ssh
Spelling fixes in in-line docs.
More spelling fixes in in-line docs.
Yet more spelling fixes in in-line docs.
Fix pkg.installed regression (yumpkg)

This fixes a regression caused by the "pre-flight" checks recently added
to the pkg.installed state. The check_db function was not properly
handling 32-bit packages on a 64-bit OS.

In the process of investigating this regression, I also discovered a bug
in which pkg.latest_version was not identifying 32-bit versions of
packages, effectively rendering it impossible to install these packages
using pkg.latest states.

This commit fixes both bugs.
Bump Salt Windows installer version. Add to docs
Merge pull request #7936 from UtahDave/develop

Bump Salt Windows installer version. Add to docs