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 configuration parsing of lists #328

Merged
merged 3 commits into from
Jan 10, 2019
Merged

Fix configuration parsing of lists #328

merged 3 commits into from
Jan 10, 2019

Conversation

mpfz0r
Copy link
Contributor

@mpfz0r mpfz0r commented Jan 9, 2019

Don't use ucfg.Merge because this will merge the contents
of two slices by copying them on top of each other.

Use a much simpler approach and just join the configuration
strings together before parsing them.

Fixes #327

@mpfz0r
Fix configuration parsing of lists
bfe5dca 
Don't use `ucfg.Merge` because this will merge the contents
of two slices by copying them on top of each other.

Use a much simpler approach and just join the configuration
strings together before parsing them.

Fixes #327
@mpfz0r mpfz0r added bug blocker If not finished by release date, the release will be postponed. ready-for-review labels Jan 9, 2019
@mpfz0r mpfz0r added this to the 3.0.0 milestone Jan 9, 2019
@mpfz0r mpfz0r requested a review from bernd January 9, 2019 16:51
mpfz0r added 2 commits January 10, 2019 14:38
@mpfz0r
Handle configurations with yaml doc separators
9dd1378 
Yaml doc separators would get in the way of merging the configuration
with the default.
@mpfz0r
Be more explicit about empty lists in the configuration
8ef8adf
@bernd bernd self-assigned this Jan 10, 2019
@bernd bernd merged commit ce69678 into master Jan 10, 2019
@bernd bernd deleted the issue-327 branch January 10, 2019 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bernd bernd bernd approved these changes

Assignees

@bernd bernd

Labels
blocker If not finished by release date, the release will be postponed. bug ready-for-review
Projects
None yet
Milestone
3.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@mpfz0r @bernd