Sync recent master changes to v4 #316
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* The deprecated items appear after the normative items. * The removed items appear after the deprecated items. * All in their respective indicies. * Fix up `check-attr-refs.py` to check for deprecated and removed items that have references in the document which indicates that they were not completely removed. Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit afb09d4)
* Fix PMIX_COLLECTIVE_ALGO_REQD removal reference * Remove PMIX_MAPPER references * Remove PMIX_NON_PMI references * Remove PMIX_PROC_URI references Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit 2fb4eb2)
Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit a3ff5eb)
Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit 203cb5c)
Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit 1cb899c)
Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit 121880c)
…tool_attach_to_server Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit 446c5fe)
Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit f81784a)
* Adds the following: - `PMIx_Parse_cpuset_string` - `PMIx_server_generate_locality_string` - `PMIx_server_generate_cpuset_string` * Fix cross-references of APIs to point to their blocking counterpart (instead of the nonblocking counterpart) for consistency. * Fix cross-references of callbacks to their C counterparts * Fix name of PMIx_Allocation_request Python binding from allocate to allocation_request * Fix arguments passed to Tool.set_server Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit de6fef7)
Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit 70fd1f4)
* Move from `xwatermark` to `draftwatermark` Signed-off-by: Joshua Hursey <jhursey@us.ibm.com> (cherry picked from commit f1b90f7)
|
It should merge just fine, but let me review 315 and get it merged then we can re-sync and resolve anything on this PR. |
rhc54
approved these changes
Dec 14, 2020
|
@jjhursey Just one tiny merge conflict which I resolved online. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bring over: