Merge 5.0.4 into 5.1.x #1659
Merged
Merge 5.0.4 into 5.1.x #1659
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
Fix nhibernate#1650 in 5.0.x
Add missing cache setting
Wait for some time |
|
You already have a merge commit here. You can just fast-forward (with cli tools). |
hazzik
approved these changes
Apr 12, 2018
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.
Should this be squashed or merged further? It looks like merging in such case may bloat the history with many merge commits.
And do we release 5.1.2 at once, or do we wait in case some other things are to be fixed in 5.1.x?