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.

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

Unbreak merge of LogConfiguration config #978

Merged
merged 4 commits into from
Apr 4, 2018

Conversation

stromnet
Copy link
Contributor

Follow-up on #948, bugfix. LogConfiguration was always created with enabled=true, even if no log properties where set.

Desired functionality: if any config or property in LogConfiguration is set, enabled shall be true.

Also added short note to changelog.

If any config or property in LogConfiguration is set, enabled shall be true.
Before this fix, it was always true.
@stromnet
Copy link
Contributor Author

ping @rhuss

@codecov
Copy link

codecov bot commented Mar 26, 2018

Codecov Report

Merging #978 into master will increase coverage by 0.05%.
The diff coverage is 69.23%.

@@             Coverage Diff              @@
##             master     #978      +/-   ##
============================================
+ Coverage     51.62%   51.67%   +0.05%     
- Complexity     1351     1358       +7     
============================================
  Files           147      147              
  Lines          7446     7448       +2     
  Branches       1125     1128       +3     
============================================
+ Hits           3844     3849       +5     
+ Misses         3235     3234       -1     
+ Partials        367      365       -2
Impacted Files Coverage Δ Complexity Δ
...c/main/java/io/fabric8/maven/docker/StartMojo.java 0% <0%> (ø) 0 <0> (ø) ⬇️
.../fabric8/maven/docker/config/LogConfiguration.java 87.8% <66.66%> (-2.44%) 8 <1> (ø)
...config/handler/property/PropertyConfigHandler.java 71.77% <77.77%> (+2.2%) 107 <0> (+7) ⬆️

Copy link
Collaborator

@rhuss rhuss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks lgtm !

@rhuss rhuss merged commit 0673619 into fabric8io:master Apr 4, 2018
@stromnet stromnet deleted the propmerge-unbreak-logconfiguration branch April 4, 2018 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants