Merge pull request #2504 from hppritcha/topic/fix_pmix_base_help_file

rhc54 · web-flow · commit 003f7d308fbb · 2016-12-03T11:57:07.000-08:00
pmix: Fix pmix base help file.
diff --git a/opal/mca/pmix/base/help-pmix-base.txt b/opal/mca/pmix/base/help-pmix-base.txt
@@ -1,19 +1,20 @@
  -*- text -*-
 #
 # Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+#                         reserved.
 #
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
-# This is the US/English general help file for OPAL Errmgr HNP module.
+# This is the US/English general help file for OPAL PMIx base.
 #
-[errmgr-hnp:unknown-job-error]
-An error has occurred in an unknown job. This generally should not happen
-except due to an internal OPAL error.
+[pmix2-init-failed]
+PMI2_Init failed to intialize.  Return code: %d
 
-Job state: %s
-
-This information should probably be reported to the OMPI developers.
+[pmix2-init-returned-bad-values]
+PMI2_Init was intialized but negative values for job size and/or
+rank was returned.

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,20 @@`
`1`	`1`	`-- text --`
`2`	`2`	`#`
`3`	`3`	`# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.`
	`4`	`+# Copyright (c) 2016 Los Alamos National Security, LLC. All rights`
	`5`	`+# reserved.`
`4`	`6`	`#`
`5`	`7`	`# $COPYRIGHT$`
`6`	`8`	`#`
`7`	`9`	`# Additional copyrights may follow`
`8`	`10`	`#`
`9`	`11`	`# $HEADER$`
`10`	`12`	`#`
`11`		`-# This is the US/English general help file for OPAL Errmgr HNP module.`
	`13`	`+# This is the US/English general help file for OPAL PMIx base.`
`12`	`14`	`#`
`13`		`-[errmgr-hnp:unknown-job-error]`
`14`		`-An error has occurred in an unknown job. This generally should not happen`
`15`		`-except due to an internal OPAL error.`
	`15`	`+[pmix2-init-failed]`
	`16`	`+PMI2_Init failed to intialize. Return code: %d`
`16`	`17`
`17`		`-Job state: %s`
`18`		`-`
`19`		`-This information should probably be reported to the OMPI developers.`
	`18`	`+[pmix2-init-returned-bad-values]`
	`19`	`+PMI2_Init was intialized but negative values for job size and/or`
	`20`	`+rank was returned.`