Message-ID: <5166C44C.5020407@...515...> Date: Thu, 11 Apr 2013 17:10:20 +0300 From: =?ISO-8859-1?Q?Samuli_Sepp=E4nen?= MIME-Version: 1.0 References: <1346422753-19520-1-git-send-email-arne@...1227...> <201304110933.r3B9XwPT011987@...1729...> <20130411105202.GA26778@...1296...> <5166B459.9020801@...515...> <5166C2B1.8050707@...1114...> In-Reply-To: <5166C2B1.8050707@...1114...> Subject: Re: [Openvpn-devel] [PATCH applied] Re: Add the client id (CID) to the output of the status command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: quoted-printable To: "openvpn-devel@lists.sourceforge.net" > On 11/04/13 15:02, Samuli Sepp=E4nen wrote: >>> Hi, >>> >>> On Thu, Apr 11, 2013 at 11:33:58AM +0200, Gert Doering wrote: >>>> Your patch has been applied to the master branch (ACK by me).=20=20 >>>> >>>> I'm not sure whether we need this in release/2.3, but if people see th= e=20 >>>> need, please speak up and I'll cherry-pick :-) >>>> >>>> commit 662ce6acc065bddf6490b3494725b8b3987b7def (master) >>> ... unfortunately, it breaks --disable-managemnt builds :-( - good that >>> we have buildbots, stupid me for not noticing it before ACK-and-push. >> I wonder if using a "staging" repo would be too much trouble? Buildbots >> could track it, and only after all builds have succeeded, the changes >> would be pushed to master. > Tempting thought. But I'd say it will be more maintenance than real > benefit in the long run. > > Using git-revert will actually document better what we tried and why we > didn't like that patch after all. We don't need to try hide our > mistakes that well :) What mistakes? We don't make mistakes! > > Rather have a policy ... if a patch breaks something, fix it within > 24-48 hours, if not use git-revert. > Sounds like a plan. --=20 Samuli Sepp=E4nen Community Manager OpenVPN Technologies, Inc irc freenode net: mattock