Morgan Haskel e5338f2e53 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		2014-11-21 11:59:04 -05:00
..
facter	Fix tests to reflect behavior fixed on 1.7.x	2014-10-27 10:10:52 -04:00
puppet/type	Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x	2014-11-21 11:59:04 -05:00