HomePhorge

Merge branch 'maint/2.7.x/provider_parameter_description' of https://github.
78f13c57b465Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'maint/2.7.x/provider_parameter_description' of https://github.com/nfagerlund/puppet into 2.7.x

Manually Resolved Conflicts:
spec/unit/type_spec.rb

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPU78f13c57b465: Merge branch 'maint/2.7.x/provider_parameter_description' of https://github. (authored by Matt Robinson <matt@puppetlabs.com>).Oct 4 2011, 11:05 PM