summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-07-26 18:37:51 -0700
committerGitHub <noreply@github.com>2021-07-26 18:37:51 -0700
commitdf32d1488914a4c78a993079584d15521091b8aa (patch)
treeb0cfa923a6b255d560056ff20ae144ee82350096
parentd6f6d3a5930270047b0493d924e9ee738a3d0ec3 (diff)
parent1158057f68949d9ac61c990eb8c55d8063b8d4d8 (diff)
downloadchef-df32d1488914a4c78a993079584d15521091b8aa.tar.gz
Merge pull request #11864 from chef/bumps_everything
Bump all deps and resolve a chefstyle warning
-rw-r--r--Gemfile.lock8
-rw-r--r--knife/spec/integration/cookbook_download_spec.rb2
-rw-r--r--omnibus/Gemfile.lock8
3 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7ab4977c70..8d837dadd8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: f35e3c3a7d5803acc7786fd14c6b45307776307c
+ revision: 47dcaf9ec62abcc6086cd40062d923f614fbb3b9
branch: master
specs:
chefstyle (2.0.7)
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: c77e94845d18c03db5930517d1d55fac25d29a2b
+ revision: f428cdfc4bb915741c363e6f42b23a0b3ca3989f
branch: master
specs:
- ohai (17.3.1)
+ ohai (17.3.2)
chef-config (>= 14.12, < 18)
chef-utils (>= 16.0, < 18)
ffi (~> 1.9)
@@ -151,7 +151,7 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.3)
- chef-telemetry (1.0.29)
+ chef-telemetry (1.1.1)
chef-config
concurrent-ruby (~> 1.0)
chef-vault (4.1.0)
diff --git a/knife/spec/integration/cookbook_download_spec.rb b/knife/spec/integration/cookbook_download_spec.rb
index 589417126c..18b50ef824 100644
--- a/knife/spec/integration/cookbook_download_spec.rb
+++ b/knife/spec/integration/cookbook_download_spec.rb
@@ -66,7 +66,7 @@ describe "knife cookbook download", :workstation do
Downloading root_files
Cookbook downloaded to #{tmpdir}/x-1.0.1
EOM
- )
+ )
end
end
end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 9216927f17..b3fe78b328 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -158,7 +158,7 @@ GEM
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
- chef-telemetry (1.0.29)
+ chef-telemetry (1.1.1)
chef-config
concurrent-ruby (~> 1.0)
chef-utils (16.13.16)
@@ -191,7 +191,7 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-net_http (1.0.1)
- faraday-net_http_persistent (1.1.0)
+ faraday-net_http_persistent (1.2.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
ffi (1.15.3)
@@ -212,7 +212,7 @@ GEM
highline (2.0.3)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.38.3)
+ inspec-core (4.38.9)
addressable (~> 2.4)
chef-telemetry (~> 1.0, >= 1.0.8)
faraday (>= 0.9.0, < 1.5)
@@ -345,7 +345,7 @@ GEM
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
ruby-progressbar (1.11.0)
- ruby2_keywords (0.0.4)
+ ruby2_keywords (0.0.5)
rubyntlm (0.6.3)
rubyzip (2.3.2)
sawyer (0.8.2)