HomePhorge
Diffusion puppet 5b17fbac885a

(maint) Manually resolve broken merge of 2.7.x
5b17fbac885aUnpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

(maint) Manually resolve broken merge of 2.7.x

This patch resolves a merge conflict with 2.7.x, mainly around some
changes in the PMT installer face options.

Details

Provenance
Kelsey Hightower <kelsey@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU926cdf050f7a: Revert "Merge branch '2.7.x'"
Branches
Unknown
Tags
Unknown

Event Timeline

Kelsey Hightower <kelsey@puppetlabs.com> committed rPU5b17fbac885a: (maint) Manually resolve broken merge of 2.7.x (authored by Kelsey Hightower <kelsey@puppetlabs.com>).May 15 2012, 12:38 AM

Changes (4)

PathSize
lib/
puppet/
face/
module/
spec/
unit/
face/
module/

rPU5b17fbac885a

View Options

lib/puppet/face/module/install.rb

Loading...
View Options

lib/puppet/face/module/search.rb

Loading...
View Options

lib/puppet/module_tool.rb

Loading...
View Options

spec/unit/face/module/install_spec.rb

Loading...