Merge remote-tracking branch 'upstream/master' into merge_master_to_next
authorMorgan Haskel <morgan@puppetlabs.com>
Wed, 25 Mar 2015 22:32:09 +0000 (18:32 -0400)
committerMorgan Haskel <morgan@puppetlabs.com>
Wed, 25 Mar 2015 22:32:09 +0000 (18:32 -0400)
commitdc746734f17faa996e8441d176143945e8347330
tree75500f9e441adc2c3d3be6c19ad56874e270b707
parent6d12a039b78a9a5dcdbc76b703c6bb8b3efd42fe
parente671b38635b7d0ec8baff171cc8d389731ffa238
Merge remote-tracking branch 'upstream/master' into merge_master_to_next
README.md
examples/source.pp
lib/puppet/provider/apt_key/apt_key.rb
lib/puppet/type/apt_key.rb
manifests/params.pp
metadata.json
spec/acceptance/apt_key_provider_spec.rb
spec/acceptance/apt_spec.rb
spec/classes/apt_spec.rb
spec/defines/ppa_spec.rb