HomePhorge
Diffusion puppet 60b4939fc5fc

Merge remote-tracking branch 'upstream/stable'
60b4939fc5fcUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

  • upstream/stable: (PUP-3755) Use catalog's environment when filtering it Revert "(PUP-3548) Allow 4x function to call 3x function" (PUP-3548) Fix issues from review (PUP-3548) Allow 4x functions to call 3x functions (PUP-3548) Extract Runtime3Converter class from Runtime3Support module

Details

Provenance
Josh Cooper <josh@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU3e8e8420095e: Merge branch 'pr/3505' into stable
rPUb6a477eb1e5c: Merge branch 'pr/3496'
Branches
Unknown
Tags
Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPU60b4939fc5fc: Merge remote-tracking branch 'upstream/stable' (authored by Josh Cooper <josh@puppetlabs.com>).Jan 23 2015, 6:35 PM

Merged Changes

Changes (2)

PathSize
lib/
puppet/
resource/
spec/
integration/
indirector/
catalog/

rPU60b4939fc5fc

View Options

lib/puppet/resource/catalog.rb

Loading...
View Options

spec/integration/indirector/catalog/compiler_spec.rb

Loading...