Merge branch 'typo_fix' into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Allow permissive access to the cached root key.
Coupled with permissive access to the pki directory this
should allow non-priviledged users to call salt without
sudo.  This is useful for headless users using the api
and for a small handful of situations where using sudo
is undesidered.
Merge remote branch 'upstream/develop' into develop
Merge remote branch 'upstream/develop' into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge remote branch 'upstream/develop' into develop
Merge remote branch 'upstream/develop' into develop
Fix a problem with file.recurse on file ownerships and permissions.

When using file.recurse, the ownerships and permissions of the files
newly created by file.recurse will not be set. However, if the
destination files are already there then the file meta information
will be updated.

Also fixed a bug in _check_perms that always sets the result: False
even when the correct permission mode has been set.

Minor refactorings.
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote branch 'upstream/develop' into contribute

* upstream/develop: (133 commits)
  Add a verify_env option to the master and minion configs
  clean up some double quotes
  Fix #1790 by moving generic sanitize_host function into shared lib
  Single quotes
  Add Hacking file to source tarball, fix #1767
  Fix #1753, really
  Should fix #1813, please let me know
  Fix `salt-call` bug with default outputter.
  There's no logging NullHandler in `2.6`. Fix it.
  Final fix for saltstack/salt#1756
  Complete fix saltstack/salt#1806
  Some more fixes regarding saltstack/salt#1756
  Fix `tests/unit/utils/verify_test.py` since verify_user no longer accepts the log argument.
  Fix saltstack/salt#1756
  Fix saltstack/salt#1804
  Fix salstack/salt#1789
  added bash completion script
  Make sure the configuration directory path is absolute.
  Some more parsers cleanup and fixes.
  Make sure the configuration directory path is absolute.
  ...
Merge branch 'develop' of git://github.com/saltstack/salt into develop
Add a sudo before the user that is calling

This is so that we can start getting ACLs in there, the user field will
be used to pass actual user data to the acl system
Add test to test if os_family grain is provided.

Corey Quinn reported a issue where __grains__['os_family'] returned a
KeyError. This commits adds a check to the grains module test to ensure
os_family is present.
Merge pull request #1823 from mrud/mru/test_os_family

Add test to test if os_family grain is provided.
Fix bug in peer publishing jobs.lookups_jid
When the argument passed is entirely numeric ast.literal_eval()
will evaluate the numeric string to a int, long or float.  This
falls through the attempt to create a list of arguments and later
causes runner.run to fail when the argument is a string.