Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PUP-11158) Implement guard methods in base loader module #8708

Merged
merged 1 commit into from Jul 21, 2021

Conversation

joshcooper
Copy link
Contributor

Trying to compile a catalog using a DirectoryLoader failed because it doesn't
implement the guard/unguard methods. Add them to the base EnvironmentLoader
module that is mixed into various environment loaders, and overriden in the
Cached loader.

Trying to compile a catalog using a DirectoryLoader failed because it didn't
implement the guard/unguard methods. Add them to the base EnvironmentLoader
module that is mixed into various environment loaders and is overriden in the
Cached loader.
@joshcooper joshcooper requested review from a team July 21, 2021 20:28
@Magisus Magisus merged commit 8a95722 into puppetlabs:6.x Jul 21, 2021
@joshcooper joshcooper deleted the missing_guard_methods branch July 21, 2021 21:39
joshcooper added a commit to joshcooper/puppet that referenced this pull request Jul 23, 2021
…ard_methods"

This reverts commit 8a95722, reversing
changes made to f8408c9.
joshcooper added a commit to joshcooper/puppet that referenced this pull request Jul 23, 2021
…ard_methods"

This reverts commit 8a95722, reversing
changes made to f8408c9.
joshcooper added a commit to joshcooper/puppet that referenced this pull request Jul 24, 2021
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants