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	Merge remote-tracking branch 'upstream/master' into 1.7.x-merge	2014-10-27 09:57:46 -04:00
puppet	Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x	2014-11-21 11:59:04 -05:00
puppet_x/apt_key	apt_key: Support fetching keys over FTP.	2014-02-21 09:06:47 +01:00