Merge master jdk8u412-b05 into openj9-staging #738
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
Reviewed-by: aoqi, andrew Backport-of: e92e2fd4e0bc805d8f7d70f632cce0282eb1809b
…tifierCreate.java test 8251155: HostIdentifier fails to canonicalize hostnames starting with digits Reviewed-by: phh Backport-of: 2af9e5976fdf94afc7dbe5ad7827553818057bae
Reviewed-by: sgehwolf, andrew Backport-of: 917838e0a564b1f2cbfb6cc214ccbfd1a237019f
…Generator during build Reviewed-by: andrew Backport-of: a4fbee71455e8f06be1288a3886b17796ccd1f39
…/TestDockerMemoryMetrics.java always fail because OOM killed Reviewed-by: phh Backport-of: 791b427f4410057cdcdf8fd8ea0dcce71f7dc513
Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Update FreeType to version 2.13.2
|
Please rerun |
Conflicts: common/autoconf/generated-configure.sh Signed-off-by: Jason Feng <fengj@ca.ibm.com>w
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
JasonFengJ9
force-pushed
the
mergestaging
branch
from
020fe17
to
91b8d5b
Compare
Didn't realize the default autoconf is |
keithc-ca
approved these changes
Feb 28, 2024
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.
Merge master
jdk8u412-b05intoopenj9-stagingConflicts:
Signed-off-by: Jason Feng fengj@ca.ibm.com