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
Merge branch 'tickets/master/6770' 0bdbe18b3f39Unpublished
Tags None Referenced Files None Subscribers None
Description Merge branch 'tickets/master/6770' Conflicts:
Details
Event TimelinePieter 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 AM2011-03-24 00:39:42 (UTC+1)
Merged Changes |