I suspect 495 won&#39;t be mergeable after 493 goes in.<br>
<br>
But Fabrizio can then easily fix the merge - and you have an easier time backporting!<br>
<br>
Brian<br>
<br>
Sent from my iPhone<br>
<br>
&gt; On Apr 3, 2017, at 5:05 PM, xrootd-dev &lt;<a href="/cgi-bin/wa?LOGON=A3%3Dind1704%26L%3DXROOTD-DEV%26E%3Dquoted-printable%26P%3D189269%26B%3D----%253D%253D_mimepart_58e2cb695e2d5_67283fbdb3cefc386521e%26T%3Dtext%252Fhtml%3B%2520charset%3DUTF-8%26pending%3D" target="_parent" >[log in to unmask]</a>&gt; wrote:<br>
&gt; <br>
&gt; Just to make sure I don’t make a mess. I first pull 493 and then afterwards 495 and no conflicts will arise, right?<br>
&gt; <br>
&gt; Andy<br>
&gt; <br>
&gt; From: Brian Bockelman <br>
&gt; Sent: Monday, April 03, 2017 11:26 AM<br>
&gt; To: xrootd/xrootd <br>
&gt; Cc: Subscribed <br>
&gt; Subject: Re: [xrootd/xrootd] Fill the XrdSecEntity struct according to the last discussions, (#495)<br>
&gt; <br>
&gt; 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?<br>
&gt; <br>
&gt; Thanks!<br>
&gt; <br>
&gt; —<br>
&gt; You are receiving this because you are subscribed to this thread.<br>
&gt; Reply to this email directly, view it on GitHub, or mute the thread.<br>
&gt; —<br>
&gt; You are receiving this because you commented.<br>
&gt; Reply to this email directly, view it on GitHub, or mute the thread.<br>
&gt; <br>


<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">&mdash;<br />You are receiving this because you commented.<br />Reply to this email directly, <a href="https://github.com/xrootd/xrootd/pull/495#issuecomment-291291688">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AD7Yjjub6D1pDwETZGwBlodHckcc1VkPks5rsXFpgaJpZM4MxvXG">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AD7YjmZQLAomgWdvcRUywwtt29mqKLQpks5rsXFpgaJpZM4MxvXG.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/xrootd/xrootd/pull/495#issuecomment-291291688"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<!cript type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/xrootd/xrootd","title":"xrootd/xrootd","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/xrootd/xrootd"}},"updates":{"snippets":[{"icon":"PERSON","message":"@bbockelm in #495: I suspect 495 won't be mergeable after 493 goes in.\n\nBut Fabrizio can then easily fix the merge - and you have an easier time backporting!\n\nBrian\n\nSent from my iPhone\n\n\u003e On Apr 3, 2017, at 5:05 PM, xrootd-dev \<a href="/cgi-bin/wa?LOGON=A3%3Dind1704%26L%3DXROOTD-DEV%26E%3Dquoted-printable%26P%3D189269%26B%3D----%253D%253D_mimepart_58e2cb695e2d5_67283fbdb3cefc386521e%26T%3Dtext%252Fhtml%3B%2520charset%3DUTF-8%26pending%3D" target="_parent" >[log in to unmask]</a>\u003e wrote:\n\u003e \n\u003e Just to make sure I don’t make a mess. I first pull 493 and then afterwards 495 and no conflicts will arise, right?\n\u003e \n\u003e Andy\n\u003e \n\u003e From: Brian Bockelman \n\u003e Sent: Monday, April 03, 2017 11:26 AM\n\u003e To: xrootd/xrootd \n\u003e Cc: Subscribed \n\u003e Subject: Re: [xrootd/xrootd] Fill the XrdSecEntity struct according to the last discussions, (#495)\n\u003e \n\u003e 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?\n\u003e \n\u003e Thanks!\n\u003e \n\u003e —\n\u003e You are receiving this because you are subscribed to this thread.\n\u003e Reply to this email directly, view it on GitHub, or mute the thread.\n\u003e —\n\u003e You are receiving this because you commented.\n\u003e Reply to this email directly, view it on GitHub, or mute the thread.\n\u003e \n"}],"action":{"name":"View Pull Request","url":"https://github.com/xrootd/xrootd/pull/495#issuecomment-291291688"}}}</script><br>
<hr>
<p align="left">
Use REPLY-ALL to reply to list</p>
<p align="center">To unsubscribe from the XROOTD-DEV list, click the following link:<br>
<a href="https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=XROOTD-DEV&A=1" target="_blank">https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=XROOTD-DEV&A=1</a>
</p>