commit b11a8fc8e0a8189035ee7226d9e3d0e489e7fe69
Merge: 22d753364b 7974ff7264
Author: Nicole Thomas <nicole@saltstack.com>
Date:   Mon Mar 12 14:52:22 2018 -0400

    Merge pull request #46450 from gtmanfred/salt_runner

    load grains for salt.cmd runner

commit 7974ff7264f145722eaf554a10abfbca26c6778f
Author: Daniel Wallace <danielwallace@gtmanfred.com>
Date:   Thu Mar 8 09:19:18 2018 -0700

    load grains for salt.cmd runner

    Without this, none of the modules like pkg.install or service.restart can be
    used because there are no grains for the __virtual__ function to check.

commit a3c54b50f6f72badfc3adfd5505a8341beb55421
Author: Benjamin Drung <benjamin.drung@profitbricks.com>
Date:   Thu Mar 8 10:42:02 2018 +0100

    Fix various spelling mistakes

    lintian found various spelling mistakes.

    Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>

commit 8c2c4e3316ab5ce010a98fecbcc20b47a3737ea8
Merge: 978e869490 9c92aadce8
Author: Nicole Thomas <nicole@saltstack.com>
Date:   Fri Mar 2 13:46:06 2018 -0500

    Merge pull request #46208 from terminalmage/audit-umask-usage

    Blacklist os.umask

commit 509429f08c8e8c1f2b30baa81108be36c5e859a1
Merge: a97a3e6fb0 b1ce2501fd
Author: Nicole Thomas <nicole@saltstack.com>
Date:   Wed Feb 28 17:05:25 2018 -0500

    Merge pull request #46260 from terminalmage/git_pillar

    Normalize global git_pillar/winrepo config items

commit b1ce2501fd09a87fb468801614729c52b9c7cc07
Author: Erik Johnson <palehose@gmail.com>
Date:   Wed Feb 28 13:07:11 2018 -0600

    Normalize global git_pillar/winrepo config items

    We were only normalizing the global version of a config parameter if it
    had a per-remote counterpart. This was all well and good for gitfs,
    which doesn't have any config values that are global-only, but
    git_pillar and winrepo have config params which are global-only, and
    they were therefore not being normalized.

    This fixes that oversight, and also makes a few other changes in
    salt.utils.gitfs to ensure that we're not pulling from the un-normalized
    values from the opts dict, when we need to fall back to global defaults.

    Additionally, it fixes an issue in which the `git_pillar_branch` config
    item was overriding the branch set in a git_pillar remote.

commit 91b4895087b478e5c51a9c3ea08a63d119180de4
Author: Erik Johnson <palehose@gmail.com>
Date:   Wed Feb 28 10:17:27 2018 -0600

    Add documentation to the fileserver runner

    This clears up some confusion about discrepancies between the available
    files and the files that show up when the runner functions are used, if
    the fileserver configuration has been updated since the last time the
    master daemon has been restarted.

commit 31b1d98fcb1fa3e7811025b959d7e854ef4716d8
Author: Erik Johnson <palehose@gmail.com>
Date:   Mon Feb 26 21:03:43 2018 -0600

    Replace direct use of os.umask with use of existing context manager

    In cases where os.umask was being used simply to get the umask, a new
    helper function has been added to keep improper direct usage of os.umask
    from permanenly modifying the umask.

commit 467ff841cdfc1f81fa32efd4aa29d2ab3b3452ab
Author: Erik Johnson <palehose@gmail.com>
Date:   Thu Feb 22 10:01:40 2018 -0600

    pillarenv argument should default to None and not the value from opts

commit 2a185855ea89ac5bd9a87a80914cfb5a81d9cf7e
Author: Erik Johnson <palehose@gmail.com>
Date:   Thu Feb 22 09:19:41 2018 -0600

    Better solution for fixing the opts munging in pillar.show_pillar runner

    The pillarenv argument to the `Pillar` class is only used as an override
    of what is in the opts. Therefore, it should default to None unless
    passed in the kwargs.

    This also removes the need for a deepcopy of the opts, since we're no
    longer making changes to the opts before passing them to the `Pillar`
    constructor.

commit f9a6c86e21d9cf108ec6328e5f021b451f103328
Author: Erik Johnson <palehose@gmail.com>
Date:   Wed Feb 21 17:12:01 2018 -0600

    salt.runners.pillar.show_pillar: don't modify master opts

    This keeps us from modifying the master opts when compiling pillar data
    in this runner.

commit e0940a9fc4a82f8ffd4bcfd41182ea8cb6e19852
Author: Erik Johnson <palehose@gmail.com>
Date:   Wed Feb 21 17:08:15 2018 -0600

    Properly detect use of the state.orch alias and add orch jid to kwargs

    Before, only when `salt-run state.orchestrate` was used would we add the
    orch jid to the kwargs.

commit 68c7f3dcba478545de2d761b4024e17a3fb12402
Author: kstreee <kstreee@gmail.com>
Date:   Fri Feb 2 14:22:49 2018 +0900

    Adds a missing return statement.

commit e1403b6813e0969025d4c9b001dea14f750e98c8
Merge: 4b2c88e2e6 c7d2081390
Author: Nicole Thomas <nicole@saltstack.com>
Date:   Wed Jan 17 12:17:58 2018 -0500

    Merge pull request #45444 from rallytime/bp-45343

    Back-port #45343 to 2017.7

commit 2f63a6dbf4b21bec2bd37a2f721b153f7c050862
Author: Erik Johnson <palehose@gmail.com>
Date:   Wed Dec 20 08:37:18 2017 -0600

    Optimization: don't allocate a new list to concatenate

commit 5074741130f84b357155c4379564a70abc19ac25
Author: Erik Johnson <palehose@gmail.com>
Date:   Tue Dec 19 21:50:03 2017 -0600

    EAFP

    If the __pycache__ dir is not present, we will get an OSError, which we
    are already catching and ignoring. No need to check for that dir.

commit 85dbdc6a399c9ad33e6d97aa3f0fc93299e9e42b
Author: Erik Johnson <palehose@gmail.com>
Date:   Tue Dec 19 21:41:02 2017 -0600

    PY3: Make loader ignore .pyc files not in __pycache__

    This keeps the loader from loading a PY2 .pyc file if it is present.

commit c7d2081390ed52017f6aefac1cff5eddd1278311
Author: rrroo <31890542+rrroo@users.noreply.github.com>
Date:   Fri Jan 12 13:47:20 2018 +0100

    Support expr_form for manage.up, manage.down