From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Jul 2021 11:09:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/433'
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/cc9c46345479e6ea661668ca7f63ad2593a7aeb4?hp=-c

Merge remote-tracking branch 'github/pull/433'
---

cc9c46345479e6ea661668ca7f63ad2593a7aeb4
diff --combined Gemfile.lock
index a11015352,1d3d73c0a..f7810e808
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -7,7 -7,7 +7,7 @@@ GE
      chef-utils (17.2.29)
        concurrent-ruby
      concurrent-ruby (1.1.9)
 -    cookstyle (7.14.2)
 +    cookstyle (7.15.0)
        rubocop (= 1.17.0)
      diff-lcs (1.4.4)
      docker-api (2.1.0)
@@@ -15,17 -15,17 +15,17 @@@
        multi_json
      ed25519 (1.2.4)
      erubi (1.10.0)
-     excon (0.82.0)
-     ffi (1.15.1)
+     excon (0.83.0)
+     ffi (1.15.3)
      gssapi (1.3.1)
        ffi (>= 1.0.1)
      gyoku (1.3.1)
        builder (>= 2.1.2)
      httpclient (2.8.3)
-     kitchen-dokken (2.13.0)
+     kitchen-dokken (2.14.0)
        docker-api (>= 1.33, < 3)
        lockfile (~> 2.1)
-       test-kitchen (>= 1.15, < 3)
+       test-kitchen (>= 1.15, < 4)
      license-acceptance (2.1.13)
        pastel (~> 0.7)
        tomlrb (>= 1.2, < 3.0)
@@@ -88,7 -88,7 +88,7 @@@
        parser (>= 3.0.1.1)
      ruby-progressbar (1.11.0)
      rubyntlm (0.6.3)
-     rubyzip (2.3.0)
+     rubyzip (2.3.1)
      serverspec (2.41.8)
        multi_json
        rspec (~> 3.0)