diff options
| author | Marc Chamberland <chamberland.marc@gmail.com> | 2020-05-11 19:14:01 -0400 |
|---|---|---|
| committer | Lance Albertson <lance@osuosl.org> | 2020-09-15 14:04:36 -0700 |
| commit | 1633da85e2aa3c8b8d8e1bd284ea8c82966d68a0 (patch) | |
| tree | 8388a5f96adff22246c4fa458cf180f952241a3e /lib/chef/application | |
| parent | 215dfd4834cf59e508c26b45dbddbc698c57fd7b (diff) | |
| download | chef-1633da85e2aa3c8b8d8e1bd284ea8c82966d68a0.tar.gz | |
merge all dist files back into dist.rb
Signed-off-by: Marc Chamberland <chamberland.marc@gmail.com>
Signed-off-by: Lance Albertson <lance@osuosl.org>
Diffstat (limited to 'lib/chef/application')
| -rw-r--r-- | lib/chef/application/exit_code.rb | 2 | ||||
| -rw-r--r-- | lib/chef/application/windows_service.rb | 2 | ||||
| -rw-r--r-- | lib/chef/application/windows_service_manager.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/application/exit_code.rb b/lib/chef/application/exit_code.rb index c634ba2b58..817bbca2f7 100644 --- a/lib/chef/application/exit_code.rb +++ b/lib/chef/application/exit_code.rb @@ -22,7 +22,7 @@ class Chef # These are the exit codes defined in Chef RFC 062 # https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md class ExitCode - require "chef-utils/dist/infra" + require "chef-utils/dist" # -1 is defined as DEPRECATED_FAILURE in RFC 062, so it is # not enumerated in an active constant. diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index 8332b1e747..70149ea082 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -29,7 +29,7 @@ require "socket" unless defined?(Socket) require "uri" unless defined?(URI) require "win32/daemon" require_relative "../mixin/shell_out" -require "chef-utils/dist/infra" +require "chef-utils/dist" class Chef class Application diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb index 5bbebd62e2..f630ed57d2 100644 --- a/lib/chef/application/windows_service_manager.rb +++ b/lib/chef/application/windows_service_manager.rb @@ -21,7 +21,7 @@ if RUBY_PLATFORM.match?(/mswin|mingw32|windows/) end require_relative "../config" require "mixlib/cli" unless defined?(Mixlib::CLI) -require "chef-utils/dist/infra" +require "chef-utils/dist" class Chef class Application |