Hi, On Thu, Apr 22, 2021 at 10:27:29AM +0200, Gert Doering wrote: > I have force-pushed 2.4 without that commit (no tags set, so no harm done) > and applied it to master, where it was intended to go
Well. I tried that (though I should have known better) and neither sf
nor gitlab actually let me, and I think that's actually good :-)
So, release/2.4 has a erroneous commit + a revert commit now.
It hasn't been actually broken at any time (because the commit is okay),
it was just against our approach to "which commits go where".
$ git log release/2.4
commit 5e272a0196f3a9ac9423397079779ac8bbdf6159 (HEAD)
Author: Gert Doering <g...@greenie.muc.de>
Date: Thu Apr 22 10:26:12 2021 +0200
Revert "Remove always enabled USE_64_BIT_COUNTERS define"
commit 1bdd09e7e019ac6d8fdc1b009bdec818b9183e76
Author: Arne Schwabe <a...@rfc2549.org>
Date: Wed Apr 21 15:43:44 2021 +0200
Remove always enabled USE_64_BIT_COUNTERS define
commit 092734634796e9637920e029fea716afc146cd82 (tag: v2.4.11,
vweb1/release/2.4)
Author: Gert Doering <g...@greenie.muc.de>
Date: Tue Apr 20 15:31:32 2021 +0200
Preparing release v2.4.11 (ChangeLog, version.m4, Changes.rst)
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
