HomePhorge

Merge branch 'tickets/master/6770'
0bdbe18b3f39Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'tickets/master/6770'

Conflicts:
lib/puppet/interface/certificate.rb
spec/unit/application/interface_base_spec.rb
spec/unit/interface/interface_collection_spec.rb

Event Timeline

Pieter van de Bruggen <pieter@puppetlabs.com> committed rPU0bdbe18b3f39: Merge branch 'tickets/master/6770' (authored by Pieter van de Bruggen <pieter@puppetlabs.com>).Mar 24 2011, 12:39 AM