summaryrefslogtreecommitdiff
path: root/lib/chef/resources.rb
diff options
context:
space:
mode:
authorDerek Groh <derekgroh@gmail.com>2018-09-04 13:08:16 -0500
committerDerek Groh <derekgroh@gmail.com>2018-09-04 13:08:16 -0500
commitf923a7b3297a57506adb265d0c2d8d5671596f32 (patch)
tree00801dc895b91ab308521734a3a216db6247e9a8 /lib/chef/resources.rb
parenteada76335bcf43478b9b3a3d9727c0b127c8bc06 (diff)
parentd06801ff46c0ba2108595bb66da7c638e10eba6c (diff)
downloadchef-f923a7b3297a57506adb265d0c2d8d5671596f32.tar.gz
Merge branch 'master' of https://github.com/chef/chef into feature/windows_ad_join
Diffstat (limited to 'lib/chef/resources.rb')
-rw-r--r--lib/chef/resources.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb
index 3ae47a3a4a..43dc8c9e75 100644
--- a/lib/chef/resources.rb
+++ b/lib/chef/resources.rb
@@ -1,6 +1,6 @@
#
# Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2010-2016, Chef Software, Inc.
+# Copyright:: Copyright 2010-2018, Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +31,8 @@ require "chef/resource/chocolatey_config"
require "chef/resource/chocolatey_package"
require "chef/resource/chocolatey_source"
require "chef/resource/cron"
+require "chef/resource/cron_access"
+require "chef/resource/cron_d"
require "chef/resource/csh"
require "chef/resource/directory"
require "chef/resource/dmg_package"
@@ -64,8 +66,13 @@ require "chef/resource/ohai"
require "chef/resource/ohai_hint"
require "chef/resource/openbsd_package"
require "chef/resource/openssl_dhparam"
+require "chef/resource/openssl_ec_private_key"
+require "chef/resource/openssl_ec_public_key"
require "chef/resource/openssl_rsa_private_key"
require "chef/resource/openssl_rsa_public_key"
+require "chef/resource/openssl_x509_certificate"
+require "chef/resource/openssl_x509_crl"
+require "chef/resource/openssl_x509_request"
require "chef/resource/package"
require "chef/resource/pacman_package"
require "chef/resource/paludis_package"