HomePhorge
Diffusion puppet 9bbc737de813

Merge pull request #2831 from melissaanne/ticket/stable/fix-conflict
9bbc737de813Unpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #2831 from melissaanne/ticket/stable/fix-conflict

(PUP-2878) file conflict upgrading from 2.7.26 to 3.6.2

Details

Provenance
Andrew Parker <andy@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU4b13ae6c56a4: (PUP-2878) file conflict upgrading from 2.7.26 to 3.6.2
rPU217ff9ee47b2: (maint) Pin rest-client gem to 1.6.7
Branches
Unknown
Tags
Unknown

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPU9bbc737de813: Merge pull request #2831 from melissaanne/ticket/stable/fix-conflict (authored by Andrew Parker <andy@puppetlabs.com>).Jul 15 2014, 8:59 PM

Merged Changes

Changes (1)

PathSize
ext/
debian/

rPU9bbc737de813

View Options

ext/debian/control

Loading...