Fixes #7417: Merge error from #7190 - extra code appeared in 3.1 branch (that does nothing harmful) #768
Conversation
This file contains 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
| action => immediate, | ||
| move_obstructions => "true", | ||
| classes => success("config", "no_update", "config_ok"); | ||
|
|
There was a problem hiding this comment.
This is the block added from the erroneous merge - see fd5b81c?w=1#diff-9f66b723ef155b2f50014b41c8e47a38R230
|
Actually please don't merge this yet, a piece is missing |
|
PR updated |
jooooooon
force-pushed
the
bug_7417/merge_error_from_7190_extra_code_appeared_in_3_1_branch_that_does_nothing_harmful
branch
from
7f27260
to
4abf6b7
Compare
…ch (that does nothing harmful)
|
PR updated |
jooooooon
force-pushed
the
bug_7417/merge_error_from_7190_extra_code_appeared_in_3_1_branch_that_does_nothing_harmful
branch
from
4abf6b7
to
0282afa
Compare
|
OK, good to go again |
|
such weirdness |
ncharles
added a commit
that referenced
this pull request
Nov 17, 2015
…_extra_code_appeared_in_3_1_branch_that_does_nothing_harmful Fixes #7417: Merge error from #7190 - extra code appeared in 3.1 branch (that does nothing harmful)
amousset
pushed a commit
to amousset/rudder-techniques
that referenced
this pull request
Dec 8, 2015
…iet_during_build Fixes #7317: Make maven quiet during build
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.
https://www.rudder-project.org/redmine/issues/7417