HomePhorge

Merge remote-tracking branch 'upstream/2.7.x' into 3.0rc
77b50d00d042Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/2.7.x' into 3.0rc

  • upstream/2.7.x: (Maint) Spec test wasn't testing anything (#14964) Unlink Tempfiles consistently across different ruby versions

Conflicts:
lib/puppet/util.rb
spec/unit/util_spec.rb

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPU77b50d00d042: Merge remote-tracking branch 'upstream/2.7.x' into 3.0rc (authored by Andrew Parker <andy@puppetlabs.com>).Jul 13 2012, 6:32 PM