Code Review / puppet-modules / puppetlabs-apt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(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)
commite5338f2e53bb47842576e1a2a4391335777e8271
treea652cd5a429f459044421dedda89327b8f41e007tree | snapshot
parent1fad3f60709b6d0397f82665514707bfa2ac6526commit | diff
parent1e7cef842967657c803415fe2f37f564f7bce2edcommit | diff
Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x

Conflicts:
lib/facter/apt_package_updates.rb
lib/facter/apt_security_updates.rb
lib/facter/apt_updates.rb
lib/puppet/provider/apt_key/apt_key.rb diff1 | diff2 | blob | history
spec/unit/puppet/type/apt_key_spec.rb diff1 | diff2 | blob | history