Skip to content

Release 5.1.2 #1664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 9, 2018
Merged

Conversation

fredericDelaporte
Copy link
Member

@fredericDelaporte fredericDelaporte commented Apr 16, 2018

And add a missing 5.0.0 possible breaking change, see #1663.

The GitHub 5.0.0 release is not yet updated with that missing possible breaking change, I will do that once this PR is approved. (Update: now done.)

I am already preparing this release just for not forgetting about adding that possible breaking change.

@fredericDelaporte
Copy link
Member Author

Rebased and 5.1.2 release notes updated with latest change.

@fredericDelaporte
Copy link
Member Author

Rebased again, line for #1670 added in release notes. I think I will release this soon (maybe tomorrow).

@hazzik
Copy link
Member

hazzik commented May 1, 2018

Ok.

@fredericDelaporte
Copy link
Member Author

AppVeyor build is quite flaky. This is annoying.

Anyway, I now consider fixing #1667 in 5.1.x, if it is considered a thing to fix in NHibernate (which would be safer).

@hazzik
Copy link
Member

hazzik commented May 3, 2018

Anyway, I now consider fixing #1667 in 5.1.x

Go for it.

@fredericDelaporte fredericDelaporte force-pushed the Release5.1.2 branch 2 times, most recently from 8137d95 to a150861 Compare May 5, 2018 18:51
Copy link
Member

@hazzik hazzik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to wait all scheduled issues resolved

@fredericDelaporte
Copy link
Member Author

Of course. That is in the release procedure anyway.

@fredericDelaporte
Copy link
Member Author

Notes updated and branch rebased. (Contrary to the Release5.0.6 branch, which was not up-to-date and which build must not be used for the release. I am waiting the 5.0.x release build. Anyway, we are supposed to published from base branch builds rather than from PR branch builds.)

@hazzik
Copy link
Member

hazzik commented May 9, 2018

Do you plan to merge 5.0.6 to 5.1.x? Or are you willing to let them diverge?

@fredericDelaporte
Copy link
Member Author

That would be a "no-op" merge. I think that when we have started back-porting instead of fixing in the older branch then merging to newer branches, we should let the older branch diverge. This is why I have manually ported here the 5.0.6 release notes changes.

But if you rather not have any current major branches diverging, we can still merge it back to 5.1.x before releasing 5.1.2, even if this will somewhat pollute the history. (In such case we should avoid back-porting to 5.0.x but instead fix there then merge to newer branches.)

@hazzik
Copy link
Member

hazzik commented May 9, 2018

I'm ok with diverging.

@fredericDelaporte fredericDelaporte merged commit d613336 into nhibernate:5.1.x May 9, 2018
@fredericDelaporte fredericDelaporte deleted the Release5.1.2 branch May 9, 2018 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants