Adding changes for issue #6303 for branch v4.0.x.

[uberlinuxguy]

Signed-off-by: Jason Williams [email protected]

[ompiteam-bot]

Can one of the admins verify this patch?

[jsquyres]

Refs #6303

ok to test

[rhc54]

Looks fine to me

[ggouaillardet]

@uberlinuxguy Thanks for the fix and the PR !

Since 98d81a5 has been merged into master, the way we do things in Open MPI is cherry-pick -x 98d81a5f7a619d5a19615297a6fe8a18d8e3781c into the release branches, so the commit message contains the following line

(cherry picked from commit 98d81a5f7a619d5a19615297a6fe8a18d8e3781c)

you might have to manually fix a few things because the cherry-pick does not work out of the box,
in this case I replace cherry picked with back-ported. In some cases, there is no cherry-pick possible because master does things differently than the release branches, and we explicitly state in the commit message this is a one-off commit for the release branches.

Could you please fix the PRs so they include the reference to the commit in the master branch ?
Then you will have to git push --force ... in order to overwrite the (commits of the) existing PRs.

[uberlinuxguy]

Thank you for the clarification @ggouaillardet. I will go through them tomorrow and adjust them. I am sorry but I am new to the process. I read the docs, but I guess I missed some things or perhaps there are gaps. Not to worry, I got it now though. I did do a cherry pick, but I guess something got messed up in the commit. Where is the best place to ask if I have questions while trying to do the cherry picking?

[ggouaillardet]

you can ask right here !

[uberlinuxguy]

@ggouaillardet I think I got the commit message updated now. I'll double check the other pull requests too, but does it look right to you now?

[ggouaillardet]

This one looks good to me, thanks !