HomePhorge
Diffusion puppet 727c8d7fc23c

Merge remote-tracking branch 'upstream/stable'
727c8d7fc23cUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

  • upstream/stable: (PUP-3806) Add missing support for interpolation in collection (maint) Update deep_merge to 1.0.1 on x86

Details

Provenance
Josh Cooper <josh@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPUa6dc04ba9edc: Merge pull request #3445 from MikaelSmith/maint/stable/update-deep_merge-1.0.
rPU200f990b79cf: Merge remote-tracking branch 'upstream/pr/3433'
Branches
Unknown
Tags
Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPU727c8d7fc23c: Merge remote-tracking branch 'upstream/stable' (authored by Josh Cooper <josh@puppetlabs.com>).Jan 7 2015, 1:12 AM

Merged Changes

Changes (3)

PathSize
ext/
lib/
puppet/
pops/
evaluator/
spec/
integration/
parser/

rPU727c8d7fc23c

View Options

ext/build_defaults.yaml

Loading...
View Options

lib/puppet/pops/evaluator/collector_transformer.rb

Loading...
View Options

spec/integration/parser/collection_spec.rb

Loading...