summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-08-29 14:10:41 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2018-08-29 14:10:41 -0700
commit03df6156bc759a62a102466454557f3bf63e8e74 (patch)
treec80232873087001e09c3a794fce11b6260cabe01
parentfa535d8f6f7b8a1079e5986a4827f18b3b9ab8cd (diff)
downloadchef-lcg/better-deprecation.tar.gz
replace "core" with "the client"lcg/better-deprecation
because users don't grok "core" Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/node_map.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/node_map.rb b/lib/chef/node_map.rb
index 9b0a7cef22..ac60b590b6 100644
--- a/lib/chef/node_map.rb
+++ b/lib/chef/node_map.rb
@@ -38,12 +38,12 @@
class Chef
class NodeMap
COLLISION_WARNING_14 = <<~EOH.gsub(/\s+/, " ").strip
- %{type_caps} %{key} from a cookbook is overriding the %{type} from core. Please upgrade your cookbook
+ %{type_caps} %{key} from a cookbook is overriding the %{type} from the client. Please upgrade your cookbook
or remove the cookbook from your run_list before the next major release of Chef.
EOH
COLLISION_WARNING_15 = <<~EOH.gsub(/\s+/, " ").strip
- %{type_caps} %{key} from core is overriding the %{type} from a cookbook. Please upgrade your cookbook
+ %{type_caps} %{key} from the client is overriding the %{type} from a cookbook. Please upgrade your cookbook
or remove the cookbook from your run_list.
EOH