[LU-119] Merge goof on master? Created: 07/Mar/11  Updated: 08/Mar/11  Resolved: 08/Mar/11

Status: Resolved
Project: Lustre
Component/s: None
Affects Version/s: Lustre 2.1.0
Fix Version/s: Lustre 2.1.0

Type: Bug Priority: Minor
Reporter: Christopher Morrone Assignee: Brian Murrell (Inactive)
Resolution: Fixed Votes: 0
Labels: None

Severity: 3
Rank (Obsolete): 5102

 Description   

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.

If it WASN'T accidental, then it absolutely requires an explanation in the commit message.

 Comments   
Comment by Robert Read (Inactive) [ 07/Mar/11 ]

Yes, this appears to be accidental.

Comment by Build Master (Inactive) [ 07/Mar/11 ]

Integrated in reviews-centos5 #406
LU-119 Remove code added by a conflict resolution

Brian J. Murrell : ee6a911b45b821ce7fb63e44bfe21ee4b6fef247
Files :

  • lustre.spec.in
Comment by Build Master (Inactive) [ 07/Mar/11 ]

Integrated in lustre-master-centos5 #137
LU-119 Remove code added by a conflict resolution

Oleg Drokin : a6e094fa87542e13265fd5a97a06d56b61313c98
Files :

  • lustre.spec.in
Generated at Sat Feb 10 01:03:56 UTC 2024 using Jira 9.4.14#940014-sha1:734e6822bbf0d45eff9af51f82432957f73aa32c.