Merge branch '2.7.x' into 3.0.x
3297c6dc9366Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Merge branch '2.7.x' into 3.0.x

Conflicts:
lib/puppet/version.rb

Provenance

Moses Mendoza <moses@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

Branches

Unknown

Tags

Unknown

Moses Mendoza <moses@puppetlabs.com> committed rPU3297c6dc9366: Merge branch '2.7.x' into 3.0.x (authored by Moses Mendoza <moses@puppetlabs.com>).Nov 9 2012, 11:19 PM

This commit is empty and does not affect any paths.