Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix regression in dynamic pillarenv #51317

Merged
merged 2 commits into from Jan 25, 2019
Merged

Fix regression in dynamic pillarenv #51317

merged 2 commits into from Jan 25, 2019

Commits on Jan 24, 2019

  1. Fix regression in dynamic pillarenv 

    saltstack#50417 caused a regression in
which the env name is not properly detected as `base` when
`get_checkout_target()` returns the branch name corresponding to that
repo's `base` config option. This corrects that regression.
    @terminalmage
    terminalmage committed Jan 24, 2019
    Copy the full SHA
    4c4ded3 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2019

  1. Merge branch '2018.3.4' into fix-pr-50417

    @s0undt3ch
    s0undt3ch committed Jan 25, 2019
    Copy the full SHA
    4be2891 View commit details
    Browse the repository at this point in the history