summaryrefslogtreecommitdiff
path: root/lib/chef/knife
diff options
context:
space:
mode:
authorMarc Chamberland <chamberland.marc@gmail.com>2020-05-11 19:14:01 -0400
committerLance Albertson <lance@osuosl.org>2020-09-15 14:04:36 -0700
commit1633da85e2aa3c8b8d8e1bd284ea8c82966d68a0 (patch)
tree8388a5f96adff22246c4fa458cf180f952241a3e /lib/chef/knife
parent215dfd4834cf59e508c26b45dbddbc698c57fd7b (diff)
downloadchef-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/knife')
-rw-r--r--lib/chef/knife/client_create.rb2
-rw-r--r--lib/chef/knife/configure.rb2
-rw-r--r--lib/chef/knife/core/bootstrap_context.rb2
-rw-r--r--lib/chef/knife/core/windows_bootstrap_context.rb2
-rw-r--r--lib/chef/knife/exec.rb2
-rw-r--r--lib/chef/knife/node_show.rb2
-rw-r--r--lib/chef/knife/ssl_check.rb2
-rw-r--r--lib/chef/knife/status.rb2
-rw-r--r--lib/chef/knife/user_create.rb2
9 files changed, 9 insertions, 9 deletions
diff --git a/lib/chef/knife/client_create.rb b/lib/chef/knife/client_create.rb
index 4fe3bbeb02..9cdc20045e 100644
--- a/lib/chef/knife/client_create.rb
+++ b/lib/chef/knife/client_create.rb
@@ -17,7 +17,7 @@
#
require_relative "../knife"
-require "chef-utils/dist/server"
+require "chef-utils/dist"
class Chef
class Knife
diff --git a/lib/chef/knife/configure.rb b/lib/chef/knife/configure.rb
index dad54ce133..44107661a4 100644
--- a/lib/chef/knife/configure.rb
+++ b/lib/chef/knife/configure.rb
@@ -17,7 +17,7 @@
#
require_relative "../knife"
-require "chef-utils/dist/server"
+require "chef-utils/dist"
class Chef
class Knife
diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb
index 14e7374b0e..54e1cba5e7 100644
--- a/lib/chef/knife/core/bootstrap_context.rb
+++ b/lib/chef/knife/core/bootstrap_context.rb
@@ -19,7 +19,7 @@
require_relative "../../run_list"
require_relative "../../util/path_helper"
require "pathname" unless defined?(Pathname)
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
class Chef
class Knife
diff --git a/lib/chef/knife/core/windows_bootstrap_context.rb b/lib/chef/knife/core/windows_bootstrap_context.rb
index 15c4bd3020..775eab05e2 100644
--- a/lib/chef/knife/core/windows_bootstrap_context.rb
+++ b/lib/chef/knife/core/windows_bootstrap_context.rb
@@ -18,7 +18,7 @@
require_relative "bootstrap_context"
require_relative "../../util/path_helper"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
class Chef
class Knife
diff --git a/lib/chef/knife/exec.rb b/lib/chef/knife/exec.rb
index b42cc7d8f1..6a60355520 100644
--- a/lib/chef/knife/exec.rb
+++ b/lib/chef/knife/exec.rb
@@ -17,7 +17,7 @@
#
require_relative "../knife"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
class Chef::Knife::Exec < Chef::Knife
diff --git a/lib/chef/knife/node_show.rb b/lib/chef/knife/node_show.rb
index e87d7b165e..e58982b320 100644
--- a/lib/chef/knife/node_show.rb
+++ b/lib/chef/knife/node_show.rb
@@ -18,7 +18,7 @@
require_relative "../knife"
require_relative "core/node_presenter"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
class Chef
class Knife
diff --git a/lib/chef/knife/ssl_check.rb b/lib/chef/knife/ssl_check.rb
index d9bd9b0857..e447d3d2a8 100644
--- a/lib/chef/knife/ssl_check.rb
+++ b/lib/chef/knife/ssl_check.rb
@@ -17,7 +17,7 @@
#
require_relative "../knife"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
class Chef
class Knife
diff --git a/lib/chef/knife/status.rb b/lib/chef/knife/status.rb
index b67d9b811a..9a86153d41 100644
--- a/lib/chef/knife/status.rb
+++ b/lib/chef/knife/status.rb
@@ -19,7 +19,7 @@
require_relative "../knife"
require_relative "core/status_presenter"
require_relative "core/node_presenter"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
class Chef
class Knife
diff --git a/lib/chef/knife/user_create.rb b/lib/chef/knife/user_create.rb
index 83ed21296f..07d847ec98 100644
--- a/lib/chef/knife/user_create.rb
+++ b/lib/chef/knife/user_create.rb
@@ -18,7 +18,7 @@
#
require_relative "../knife"
-require "chef-utils/dist/server"
+require "chef-utils/dist"
class Chef
class Knife