summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-03-01 11:35:44 -0800
committerGitHub <noreply@github.com>2021-03-01 11:35:44 -0800
commitc73374ee99a7b760d8a167a1fe5cbec3bdee210d (patch)
tree50e27691cc846aa2b982866402d61cbedea9dc49
parent2ea0c4fdba830855c2787431263be1a5849090f7 (diff)
parent4a34611ee48defe3fc80e3dd750fa5f3347ba884 (diff)
downloadchef-c73374ee99a7b760d8a167a1fe5cbec3bdee210d.tar.gz
Merge pull request #11122 from chef/bump_deps
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock2
-rw-r--r--lib/chef/compliance/default_attributes.rb2
-rw-r--r--omnibus/Gemfile.lock5
3 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f3e96e365..706a0cb998 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -369,7 +369,7 @@ GEM
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.2.0)
- webmock (3.11.2)
+ webmock (3.12.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/lib/chef/compliance/default_attributes.rb b/lib/chef/compliance/default_attributes.rb
index bf64a99369..eb3b9043ef 100644
--- a/lib/chef/compliance/default_attributes.rb
+++ b/lib/chef/compliance/default_attributes.rb
@@ -90,7 +90,7 @@ class Chef
"chef_node_attribute_enabled" => false,
# Should the built-in compliance phase run. True and false force the behavior. Nil does magic based on if you have
- # profies defined but do not have the audit cookbook enabled.
+ # profiles defined but do not have the audit cookbook enabled.
"compliance_phase" => nil
)
end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 05ab325188..5e1197f005 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -202,7 +202,7 @@ GEM
highline (2.0.3)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.26.4)
+ inspec-core (4.26.13)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0, < 1.4)
@@ -353,8 +353,9 @@ GEM
strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
- test-kitchen (2.10.0)
+ test-kitchen (2.11.0)
bcrypt_pbkdf (~> 1.0)
+ chef-utils (>= 16.4.35)
ed25519 (~> 1.2)
license-acceptance (>= 1.0.11, < 3.0)
mixlib-install (~> 3.6)