Morgan Haskel 20ddb67714 Merge remote-tracking branch 'upstream/master' into 1.7.x-merge ... Conflicts: lib/facter/apt_package_updates.rb lib/facter/apt_security_updates.rb lib/facter/apt_updates.rb		2014-10-27 09:57:46 -04:00
..
facter	Merge remote-tracking branch 'upstream/master' into 1.7.x-merge	2014-10-27 09:57:46 -04:00
puppet	Don't truncate to short keys in the type	2014-10-01 13:40:25 -05:00
puppet_x/apt_key	apt_key: Support fetching keys over FTP.	2014-02-21 09:06:47 +01:00