HomePhorge
Diffusion puppet 71fba90b31be

Merge branch '2.7.x' into 3.0.x
71fba90b31beUnpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x' into 3.0.x

Keep 3.0.x Build-Depends of ruby (not the 2.7.x Build-Depends of ruby1.8)

Conflicts:
ext/debian/control

Details

Provenance
Matthaus Owens <matthaus@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPUf6edbb921546: Merge pull request #1412 from haus/ticket/2.7.x/17777_update_build_depends
rPU96cd43638d23: Merge branch '2.7.x' into 3.0.x
Branches
Unknown
Tags
Unknown

Event Timeline

Matthaus Owens <matthaus@puppetlabs.com> committed rPU71fba90b31be: Merge branch '2.7.x' into 3.0.x (authored by Matthaus Owens <matthaus@puppetlabs.com>).Jan 18 2013, 2:41 AM

Merged Changes

Empty Commit

This commit is empty and does not affect any paths.