Merge yours, I'll try another ackk (remove / add back) tomorrow.

Le mar. 21 avr. 2020 à 19:44, Lyor Goldstein <[email protected]> a
écrit :

> >> >> Could you try with https://github.com/gnodet/mina-sshd/tree/SSHD-978
>  and see if it's stable for you
>
> Works for me - except  BCrypt.java seems to still require CRLF changes
> somehow
> I guess it will keep doing that every time we "ping pong" commits for it.
> I therefore think since it is the only such file and not subject to
> changes we can live with it being "changed"
> when we commit some new changes.
>
> In view of this - do you want me to merge my SSHD-978 branch or yours into
> master ?
>


-- 
------------------------
Guillaume Nodet

Reply via email to