Cherry-pick PR#416 and PR#417 from 2.5.x into 2.6.x #418
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
…kport_LL_tiny-improvements Partial backport of Tiny improvements PR#414 to 2.5.x: (cherry picked from commit 3d3512a) # Conflicts: # core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java Merge conflict manually resolved.
…rovements_unittest Provide unit test for partial backport PR#416 for 2.5.x (cherry picked from commit 0fabde9)
|
LGTM 👍 |
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.
Straightforward cherry-pick of PR #416 and PR #417 into 2.6.x.
The 1st cherry-pick required a manual merge-conflict resolution, the 2nd was clean.