Skip to content

Conversation

@nrgraham23
Copy link
Contributor

This pull request includes updates for the mpirun man page. The first commit is a cherry-pick from master. The second commit removes options that are not available in v2.x

@jsquyres @hppritcha

@nrgraham23 nrgraham23 added this to the v2.1.0 milestone Feb 22, 2017
@nrgraham23 nrgraham23 requested a review from hppritcha February 22, 2017 22:09
Copy link
Member

@jsquyres jsquyres left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nrgraham23 I like how you split it up into the cherry-pick and another to remove stuff that's not here on the branch. Nice!

Can you add the cherry-pick notice into the first commit message so that we can tell what commit it came from on master? Usually, you can do git cherry-pick -x HASH, where the -x has git automatically insert a line like this at the bottom of the commit:

(cherry picked from commit 048f757d9f7dd5fe53217bdd8604a37db3d123f2)

Can you manually add a line like that in your first commit? (with the proper commit hash, of course)

@hppritcha
Copy link
Member

Approved modulo @jsquyres requested commit cherry pick comment

Nathaniel Graham added 2 commits February 23, 2017 10:33
This update should fix the mpirun man page so all
mpirun command line options are included, and
mpirun commands that have been removed are no
longer in the man page.  I also fixed some of
the file formatting, and bolding of command
parameters.

Signed-off-by: Nathaniel Graham <[email protected]>

(cherry picked from commit f9c05bd)
This commit removes the man entries for commands
which are not included in v2.x.

Signed-off-by: Nathaniel Graham <[email protected]>
@nrgraham23
Copy link
Contributor Author

Updated the cherry-picked commit. Ill remember that -x option for next time.

@jsquyres
Copy link
Member

Sweet; thanks @nrgraham23

@jsquyres
Copy link
Member

This is a man page update; not waiting for CI.

@jsquyres jsquyres merged commit ca27566 into open-mpi:v2.x Feb 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants