HomePhorge
Diffusion puppet bd97d33f9014

Merge pull request #778 from kelseyhightower/master
bd97d33f9014Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #778 from kelseyhightower/master

(maint) Manually resolve broken merge of 2.7.x

Details

Provenance
Daniel Pittman <daniel@rimspace.net>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU5b17fbac885a: (maint) Manually resolve broken merge of 2.7.x
rPUa98969c1374b: Merge pull request #771 from zaphod42/bug/master/14387-user-agent-for-module…
Branches
Unknown
Tags
Unknown

Event Timeline

Daniel Pittman <daniel@rimspace.net> committed rPUbd97d33f9014: Merge pull request #778 from kelseyhightower/master (authored by Daniel Pittman <daniel@rimspace.net>).May 15 2012, 6:56 PM

Merged Changes

Changes (4)

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

rPUbd97d33f9014

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...