HomePhorge

Merge branch 'puppet-cleanup/master/bad-settings-specs' from cprice
4ddac5d183b3Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'puppet-cleanup/master/bad-settings-specs' from cprice

Conflicts:
lib/puppet/util/settings.rb

Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU4ddac5d183b3: Merge branch 'puppet-cleanup/master/bad-settings-specs' from cprice (authored by Daniel Pittman <daniel@puppetlabs.com>).Apr 27 2012, 2:43 AM