Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from:
e5338f2
)
Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x
author
Morgan Haskel
<morgan@puppetlabs.com>
Fri, 21 Nov 2014 16:59:04 +0000
(11:59 -0500)
committer
Morgan 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
No differences found