Merge remote-tracking branch 'upstream/master' into 1.7.x-merge
authorMorgan Haskel <morgan@puppetlabs.com>
Mon, 27 Oct 2014 13:57:46 +0000 (09:57 -0400)
committerMorgan Haskel <morgan@puppetlabs.com>
Mon, 27 Oct 2014 13:57:46 +0000 (09:57 -0400)
commit20ddb6771466e8db0135f74a6ee40fa897632234
tree6d78266fb5efa044e65418127938bdd2de7187a1
parentbc7601dfed3fdd9d22eb1527a394112ada447c9d
parent5d96da0c6aac8f0f9192fe6ce63548bdaee149b5
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
lib/facter/apt_updates.rb