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 consul stanza parsing when a configuration directory is used #5817

Merged
merged 5 commits into from
Jun 11, 2019
Merged

fix consul stanza parsing when a configuration directory is used #5817

merged 5 commits into from
Jun 11, 2019

Commits on Jun 11, 2019

  1. config_parse split out defaults from ParseConfig

    @langmartin
    langmartin committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    5a3a47c View commit details
    Browse the repository at this point in the history

  2. config explicitly merge defaults once when using a config directory

    @langmartin
    langmartin committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    006a9a1 View commit details
    Browse the repository at this point in the history

  3. config_parse_test, handle defaults

    @langmartin
    langmartin committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    e9fa8e5 View commit details
    Browse the repository at this point in the history

  4. config merge maintains *HCL string fields used for duration conversion

    @langmartin
    langmartin committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    4bfbeb6 View commit details
    Browse the repository at this point in the history

  5. agent/testdata add a configuration directory for testing

    @langmartin
    langmartin committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    d1ee78a View commit details
    Browse the repository at this point in the history