zeromq / libzmq

ZeroMQ core engine in C++, implements ZMTP/3.1
https://www.zeromq.org
Mozilla Public License 2.0
9.53k stars 2.34k forks source link

Problem: relicensing forced to remove support for ZMQ_RECONNECT_IVL_MAX option #4556

Closed stvales closed 1 year ago

stvales commented 1 year ago

Solution: reimplement support for ZMQ_RECONNECT_IVL_MAX without knowledge of the previous code.

bluca commented 1 year ago

Thanks - please fix the branch history by rebasing and squashing all commits. This is important as your commit needs to be merged as-is, with the statement about no previous knowledge.

bluca commented 1 year ago

also please rebase on latest main, as I've just merged the relicense, so there's no doubt this is under the new license

bluca commented 1 year ago

branch history is still not right, please do the following:

git config --global pull.rebase true
git remote add upstream https://github.com/zeromq/libzmq.git
git fetch upstream
git reset --hard upstream/master
git cherry-pick 8457207 c8763df e9ec472
git reset HEAD^^
git commit -a --amend -m "Problem: relicensing forced to remove support for ZMQ_RECONNECT_IVL_MAX option

Solution: reimplement support for ZMQ_RECONNECT_IVL_MAX without knowledge of the previous code."
git push -f
stvales commented 1 year ago

It's done, thanks for the git commands!