Code Review / puppet-modules / puppetlabs-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 1fad3f6 1e7cef8)
Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x
authorMorgan Haskel <morgan@puppetlabs.com>
Fri, 21 Nov 2014 16:59:04 +0000 (11:59 -0500)
committerMorgan Haskel <morgan@puppetlabs.com>
Fri, 21 Nov 2014 16:59:04 +0000 (11:59 -0500)
Conflicts:
lib/facter/apt_package_updates.rb
lib/facter/apt_security_updates.rb
lib/facter/apt_updates.rb

1  2 
lib/puppet/provider/apt_key/apt_key.rb patch | diff1 | diff2 | blob | history
spec/unit/puppet/type/apt_key_spec.rb patch | diff1 | diff2 | blob | history

diff --cc spec/unit/puppet/type/apt_key_spec.rb
Simple merge