https://jira.whamcloud.com This file is an XML representation of an issue en-us 9.4.14 940014 05-12-2023 https://jira.whamcloud.com/browse/LU-119 Lustre <p>It looks like there was a goof in commit ab13b69b63ca19d7fe68b8ba6afd2cb4723db78c on master. That patch reintroduces lines that were explicitly removed in commit 62345145fa7cae1846f96078bac43ddf58cea640. I think that reintroduction was accidental, and needs to be corrected.</p> <p>If it WASN'T accidental, then it absolutely requires an explanation in the commit message.</p> LU-119

Merge goof on master?

Bug Minor Resolved Fixed Brian Murrell Christopher Morrone Mon, 7 Mar 2011 09:30:01 +0000 Tue, 8 Mar 2011 09:32:22 +0000 Tue, 8 Mar 2011 09:32:22 +0000 Lustre 2.1.0 Lustre 2.1.0 0 0 <p>Yes, this appears to be accidental. </p> <p>Integrated in <span class="image-wrap" style=""><img src="http://build.whamcloud.com/images/16x16/blue.png" style="border: 0px solid black" /></span> <a href="http://build.whamcloud.com/job/reviews-centos5/406/" class="external-link" target="_blank" rel="nofollow noopener">reviews-centos5 #406</a><br/> <a href="https://jira.whamcloud.com/browse/LU-119" title="Merge goof on master?" class="issue-link" data-issue-key="LU-119"><del>LU-119</del></a> Remove code added by a conflict resolution</p> <p>Brian J. Murrell : <a href="http://git.whamcloud.com/gitweb/?p=fs/lustre-release.git&amp;a=commit&amp;h=ee6a911b45b821ce7fb63e44bfe21ee4b6fef247" class="external-link" target="_blank" rel="nofollow noopener">ee6a911b45b821ce7fb63e44bfe21ee4b6fef247</a><br/> Files : </p> <ul> <li>lustre.spec.in</li> </ul> <p>Integrated in <span class="image-wrap" style=""><img src="http://build.whamcloud.com/images/16x16/blue.png" style="border: 0px solid black" /></span> <a href="http://build.whamcloud.com/job/lustre-master-centos5/137/" class="external-link" target="_blank" rel="nofollow noopener">lustre-master-centos5 #137</a><br/> <a href="https://jira.whamcloud.com/browse/LU-119" title="Merge goof on master?" class="issue-link" data-issue-key="LU-119"><del>LU-119</del></a> Remove code added by a conflict resolution</p> <p>Oleg Drokin : <a href="http://git.whamcloud.com/gitweb/?p=fs/lustre-release.git&amp;a=commit&amp;h=a6e094fa87542e13265fd5a97a06d56b61313c98" class="external-link" target="_blank" rel="nofollow noopener">a6e094fa87542e13265fd5a97a06d56b61313c98</a><br/> Files : </p> <ul> <li>lustre.spec.in</li> </ul> Development Rank 1|hzv9of: Rank (Obsolete) 5102 Severity