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

Remove recurse_list from pillar_source_merging_strategy and add pilla… #30062

Merged
merged 6 commits into from
Jan 6, 2016
Merged

Remove recurse_list from pillar_source_merging_strategy and add pilla… #30062

merged 6 commits into from
Jan 6, 2016

Commits on Dec 29, 2015

  1. Remove recurse_list from pillar_source_merging_strategy and add pilla… 

    …r_merge_list (bool) instead
    Sean Jenkins committed Dec 29, 2015
    Configuration menu
    Copy the full SHA
    41353b7 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2015

  1. Merge remote-tracking branch 'origin/develop' into sean

    Sean Jenkins committed Dec 30, 2015
    Configuration menu
    Copy the full SHA
    f6a7aec View commit details
    Browse the repository at this point in the history

  2. Fix lint for PR30062

    Sean Jenkins committed Dec 30, 2015
    Configuration menu
    Copy the full SHA
    0ffea31 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into sean

    Sean Jenkins committed Dec 30, 2015
    Configuration menu
    Copy the full SHA
    1d7ee7b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/develop' into develop

    Sean Jenkins committed Dec 30, 2015
    Configuration menu
    Copy the full SHA
    fb6e895 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2016

  1. Set (pillar_)merge_lists to default for PR#30062

    Sean Jenkins committed Jan 6, 2016
    Configuration menu
    Copy the full SHA
    8fc656b View commit details
    Browse the repository at this point in the history