replaced merge with old mergeInPlace #315
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
removed mergeInPlace
src/conf/checkstyle.orig
Outdated
| @@ -0,0 +1,67 @@ | |||
| <?xml version="1.0"?> | |||
Member
There was a problem hiding this comment.
Do we really need this file?
Contributor
Author
There was a problem hiding this comment.
added by accident, should be removed now.
src/conf/checkstyle2.xml
Outdated
| @@ -0,0 +1,84 @@ | |||
| <?xml version="1.0"?> | |||
Member
There was a problem hiding this comment.
Do we really need this file?
Contributor
Author
There was a problem hiding this comment.
added by accident, should be removed now.
Contributor
Author
|
Any issues with merging this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 change makes
merge()act like other collections {{merge}} methods and update the item in place. ThemergeInPlace()method is removed. Any previous use ofmergeshould be replaced withfixes https://issues.apache.org/jira/browse/COLLECTIONS-829