Fix typo in margins handling. #6544
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This does not change the semantics of the code but should make things clearer and offer a negligible optimization: previously, the margins correction would be computed even if `margin == 0` as long as `do_upper_margin` was set.
|
restarted the failing job. This change does make sense to me. |
|
I'm ready to merge this, but what are the backporting rules now? |
|
I think this should be backported to 2.x but not 1.5.x since we are basically ready to release 1.5.2 and then not touch the branch after that. |
|
Makes sense to me |
WeatherGod
added a commit
that referenced
this pull request
Jun 7, 2016
Fix typo in margins handling.
|
backported as 077c72e |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This does not change the semantics of the code but should make things
clearer and offer a negligible optimization: previously, the margins
correction would be computed even if
margin == 0as long asdo_upper_marginwas set.