I suspect 495 won't be mergeable after 493 goes in. But Fabrizio can then easily fix the merge - and you have an easier time backporting! Brian Sent from my iPhone > On Apr 3, 2017, at 5:05 PM, xrootd-dev <[log in to unmask]> wrote: > > Just to make sure I don’t make a mess. I first pull 493 and then afterwards 495 and no conflicts will arise, right? > > Andy > > From: Brian Bockelman > Sent: Monday, April 03, 2017 11:26 AM > To: xrootd/xrootd > Cc: Subscribed > Subject: Re: [xrootd/xrootd] Fill the XrdSecEntity struct according to the last discussions, (#495) > > This appears to fix two out of three memory leaks also fixed by #493. To make backporting easier, can you separate the bugfixes and new features to separate commits? Or maybe just make sure #493 is merged first? > > Thanks! > > — > You are receiving this because you are subscribed to this thread. > Reply to this email directly, view it on GitHub, or mute the thread. > — > You are receiving this because you commented. > Reply to this email directly, view it on GitHub, or mute the thread. > -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/xrootd/xrootd/pull/495#issuecomment-291291688 ######################################################################## Use REPLY-ALL to reply to list To unsubscribe from the XROOTD-DEV list, click the following link: https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=XROOTD-DEV&A=1