(maint) acceptance-fix previous merge-up #1257
Merged
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
|
/cc @joshcooper |
| @@ -28,7 +40,7 @@ module HarnessOptions | |||
| end | |||
|
|
|||
| def get_options(file_path) | |||
| puts "Attempting to merge config file: #{file_path}" | |||
| puts file_path | |||
There was a problem hiding this comment.
Looks like this change might be worth preserving.
There was a problem hiding this comment.
there are a few things here that are worth preserving that we can do later. they should all be captured here: puppetlabs/puppet#4539
|
Some of these improvements will return as part of PA-139 (puppetlabs/puppet#4539). |
The previous merge-up from stable had a few conflicts improperly resolved. There were at least two refactors that conflicted. This change takes the pure stable changes, as intended. [skip ci]
er0ck
force-pushed
the
maint/master/acceptance-fix_previous_merge-up
branch
from
82bafca
to
5687646
Compare
MikaelSmith
pushed a commit
that referenced
this pull request
Jan 13, 2016
…ous_merge-up (maint) acceptance-fix previous merge-up
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.
The previous merge-up from stable had a few conflicts improperly
resolved. There were at least two refactors that conflicted. This
change takes the pure stable changes, as intended.
[skip ci]