summaryrefslogtreecommitdiff
path: root/lib/chef/client.rb
diff options
context:
space:
mode:
authorGregory Batye <gbatye@fb.com>2017-02-15 10:41:35 -0800
committerGregory Batye <gbatye@fb.com>2017-02-15 10:41:35 -0800
commitc0f2f0e22d6bd8c14e39dc8950a751fccaa30910 (patch)
tree82abcf214c0d9cb9e9aa22ca10279624a4ff09bf /lib/chef/client.rb
parente8b452c2e9cdfadebe22e1ed2d6cb94b2d4f5a0a (diff)
parentac07b819652edb10b0421c12c16cce13e6e70f23 (diff)
downloadchef-c0f2f0e22d6bd8c14e39dc8950a751fccaa30910.tar.gz
Merge remote-tracking branch 'chef/master' into fix_osx_profile
Diffstat (limited to 'lib/chef/client.rb')
-rw-r--r--lib/chef/client.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index c857da1b93..c064d33209 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -22,6 +22,7 @@ require "chef/config"
require "chef/mixin/params_validate"
require "chef/mixin/path_sanity"
require "chef/log"
+require "chef/deprecated"
require "chef/server_api"
require "chef/api_client"
require "chef/api_client/registration"