(maint) 7.x merge up into main #9111
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
Puppetserver upgraded from the JRuby 9.2.y.z series to JRuby 9.3.y.z as part of SERVER-3133. This commit updates the JRuby version used in Rspec tests to match the most recent JRuby version used in the Puppetserver 7.x series.
Refactor code into a private method.
…uest (PUP-10589) Add a generate_request option to puppet ssl
Starting with jruby-openssl 0.13.0[1] (which is included in JRuby >= 9.3.5.0), certificate signing raises an error when there is a discrepancy between the certificate and key. This behavior in JRuby differs from MRI OpenSSL. This commit adds a test for this JRuby-specific behavior and updates existing tests to skip when running on affected versions of JRuby. [1] jruby/jruby-openssl@4b2968b
(PUP-11935) Update JRuby in tests to 9.3.y.z
mhashizume
approved these changes
Sep 21, 2023
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.
No description provided.