Update to track master branch #1791
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
There have been a number of commits that didn't make
the transition to this release branch. This was usually
due to their being things in the commit that would have
provided a positive change here, but also things that
would bring in new material not intended for this release.
Unfortunately, that makes this branch difficult to maintain.
So let's sync the branch up to the HEAD of master and then
"prune" away the pieces we know we don't want here.
Signed-off-by: Ralph Castain <rhc@pmix.org>
Includes (not an exhaustive list):
(cherry picked from commit 84a55e1)
(cherry picked from commit 70ed111)
(cherry picked from commit 19eba9e)
(cherry picked from commit 1e4edb5)
Signed-off-by: Ralph Castain <rhc@pmix.org>
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.
There have been a number of commits that didn't make the transition to this release branch. This was usually due to their being things in the commit that would have provided a positive change here, but also things that would bring in new material not intended for this release.
Unfortunately, that makes this branch difficult to maintain. So let's sync the branch up to the HEAD of master and then "prune" away the pieces we know we don't want here.
Signed-off-by: Ralph Castain rhc@pmix.org
Includes (not an exhaustive list):
(cherry picked from commit 84a55e1)
(cherry picked from commit 70ed111)
(cherry picked from commit 19eba9e)
(cherry picked from commit 1e4edb5)
Includes a commit that is not a cherry-pick
bot:notacherrypick