[LU-5643] Flubbed merging of two patches in change I1d69b64eec1589f63e24f20cc624778a4be2ec60

• Status: Resolved
• Project: Lustre
• Affects Version/s: Lustre 2.5.3
• Fix Version/s: Lustre 2.5.4
• Type: Bug
• Priority: Minor
• Reporter: Christopher Morrone
• Assignee: Nathaniel Clark
• Resolution: Fixed
• Severity: 3

Description

I think that change http://review.whamcloud.com/#/c/11297/ is a good example of why you guys need to stop merging multiple commits into one. This is really truly a horrible way to go about doing things. Here are two reasons:

1) The subject of the patch comes from only one of the tickets and patches, so when I do "git log --oneline" or look at the tree in gitk or any any number of other tools, it is not even the slightest bit obvious that this isn't the same patch from master, but a combination of two patches. Bad, bad, bad.
2) The squashed patches are more difficult to review. The patch creator and all of the patch reviewers missed that the patch author flubbed the merge. It is missing the lustre/utils/Makefile.am change from http://review.whamcloud.com/#/c/10401. That would have fixed LU-5114. LU-5114 isn't mentioned in any of the patches to the best of my knowledge. What happened THERE? (I'm not going to even take the time to figure it out)

Long story short, LU-5114 is still a bug on b2_5.

Issue Links

• duplicates: LU-5114 mount_osd_ldiskfs_LDADD autoconf warning
• is related to: LU-5091 LU-4606 breaks --with-zfs-devel option
• is related to: LU-4606 Lustre hard codes libzfs.so.1 in lust...

Comments

[Peter Jones]

Nathaniel

Could you please check with some additional changes are needed on b2_5?

Thanks

Peter

[Nathaniel Clark]

http://review.whamcloud.com/12005

[Nathaniel Clark]

Patch landed to b2_5 (Oct 1. 2014)