(maint) Manually resolve broken merge of 2.7.x

[kelseyhightower]

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

[kelseyhightower]

Future merges from 2.7.x should just work from now on.

[zaphod42]

It doesn't look like this is a merge of 2.7.x and then a fix. Will this cause a problem with later merges of 2.7.x since the lineage of the changes isn't recorded?

On May 14, 2012, at 3:44 PM, Kelsey Hightower wrote:

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

You can merge this Pull Request by running:

git pull https://github.com/kelseyhightower/puppet master

Or you can view, comment on it, or merge it online at:

#778

-- Commit Summary --

• (maint) Manually resolve broken merge of 2.7.x

-- File Changes --

M lib/puppet/face/module/install.rb (5)
M lib/puppet/face/module/search.rb (4)
M lib/puppet/module_tool.rb (3)
M spec/unit/face/module/install_spec.rb (11)

-- Patch Links --

https://github.com/puppetlabs/puppet/pull/778.patch
https://github.com/puppetlabs/puppet/pull/778.diff

---

Reply to this email directly or view it on GitHub:
#778