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 deep merge of ValuesYamlFiles #2963

Merged
merged 7 commits into from
Apr 24, 2024
Merged

Fix deep merge of ValuesYamlFiles #2963

merged 7 commits into from
Apr 24, 2024

Commits on Apr 18, 2024

  1. Fix deep merge of ValuesYamlFiles

    @KevinFairise2
    KevinFairise2 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    ebd496e View commit details
    Browse the repository at this point in the history

  2. Update changelog

    @KevinFairise2
    KevinFairise2 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    85313c3 View commit details
    Browse the repository at this point in the history

  3. Add a simple regression test

    @blampe
    blampe committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    0435b26 View commit details
    Browse the repository at this point in the history

  4. Reword changelog

    @blampe
    blampe committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    87b26a9 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Use upstream mergeMaps

    @blampe
    blampe committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    7b7b645 View commit details
    Browse the repository at this point in the history

  2. Test merging with literals

    @blampe
    blampe committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    b2523ab View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge branch 'master' into kfairise/deep-merge-valuesyalm

    @blampe
    blampe committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    3ab077b View commit details
    Browse the repository at this point in the history