HomePhorge
Diffusion puppet 06ba7d5f81d4

Merge branch '2.7.x' into 3.0.x
06ba7d5f81d4Unpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x' into 3.0.x

Conflicts:
lib/puppet/version.rb

Details

Provenance
Moses Mendoza <moses@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPUcb9696de4e2c: Update lib/puppet/version.rb for 2.7.20
rPUc5eda44b99a3: Merge branch 'fix/3.0.x/17488_selinux' into 3.0.x
Branches
Unknown
Tags
Unknown

Event Timeline

Moses Mendoza <moses@puppetlabs.com> committed rPU06ba7d5f81d4: Merge branch '2.7.x' into 3.0.x (authored by Moses Mendoza <moses@puppetlabs.com>).Nov 20 2012, 2:49 AM

Merged Changes

Empty Commit

This commit is empty and does not affect any paths.