(maint) Merge 6.x to main #8715
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
…0955 (maint) Revert PUP-11158 & PUP-10955
(docs)(DOC-5035) Remove "master" in generated docs
* upstream/6.x: (packaging) Updating manpage file for 6.x Revert "Merge pull request puppetlabs#8673 from joshcooper/guard_text_domain" Revert "Merge pull request puppetlabs#8708 from joshcooper/missing_guard_methods" Revert "Merge pull request puppetlabs#8702 from luchihoratiu/PUP-10955-un-revert" (docs)(DOC-5035) Remove "master" in generated docs Conflicts: lib/puppet/defaults.rb lib/puppet/environments.rb lib/puppet/type/filebucket.rb man/man5/puppet.conf.5 Accepted text_domain_service revert in 6.x Accepted `Puppet Server` changes in 6.x
GabrielNagy
approved these changes
Jul 26, 2021
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.
(packaging) Updating manpage file for 6.x
Revert "Merge pull request (PUP-11158) Guard against environment expiration during compilation #8673 from joshcooper/guard_text_domain"
Revert "Merge pull request (PUP-11158) Implement guard methods in base loader module #8708 from joshcooper/missing_guard_methods"
Revert "Merge pull request (PUP-10955) Normalize environment name to symbol before caching #8702 from luchihoratiu/PUP-10955-un-revert"
(docs)(DOC-5035) Remove "master" in generated docs
Conflicts:
lib/puppet/defaults.rb
lib/puppet/environments.rb
lib/puppet/type/filebucket.rb
man/man5/puppet.conf.5
Accepted text_domain_service revert in 6.x
Accepted
Puppet Serverchanges in 6.x